Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/models/Business/User/MemberService.php

@@ -299,7 +299,7 @@ class MemberServiceModel extends \Business\AbstractModel
         $addKey=Common::getConfig('password.key');
         $memberTime = TIMESTAMP;
         if(!empty($addKey)){
-            $md5Str=$memberTime.$addKey.$where['password'];
+            $md5Str=$memberTime.$where['password'].$addKey;
         }else{
             $md5Str=$where['password'];
         }