合并分支 'li' 到 'master'

赠送积分和角色管理



查看合并请求 !499

@@ -212,7 +212,7 @@ class FriendController extends HomeBaseController
                         $this->success('您未作出任何修改', url('user/center/myBalance'), true);
                         $this->success('您未作出任何修改', url('user/center/myBalance'), true);
                     }
                     }
                 } else {
                 } else {
-                    $this->success('密码不一致', '', false);
+                    $this->success($integral_pwd, '', false);
                 }
                 }
             } else {
             } else {
                 $this->success('未知错误', '', false);
                 $this->success('未知错误', '', false);