Merge branch 'dev-xpy' into dev

app/controller/admin/user/User.php

@@ -813,8 +813,7 @@ class User extends BaseController
     public  function  changePro($id,UserRepository $repository)
     {
         $spread_account = $this->request->param('spread_account');
-        $uid = $this->request->param('uid');
-        $spread_uid = Db::name("user")->where('uid', $uid)->value("spread_uid");
+        $spread_uid = Db::name("user")->where('uid', $id)->value("spread_uid");
         if ($spread_uid) {
             $spread_message = Db::name("user")->where('uid', $spread_uid)->field("uid,account,nickname")->find();
         } else {
@@ -853,8 +852,7 @@ class User extends BaseController
     public function changeProLevel($id,UserRepository $repository)
     {
         $level_account = $this->request->param('level_account');
-        $uid = $this->request->param('uid');
-        $level_uid = Db::name("user")->where('uid', $uid)->value("group_id");
+        $level_uid = Db::name("user")->where('uid', $id)->value("group_id");
         if ($level_uid) {
             $level_message = Db::name("user")->where('uid', $level_uid)->field("uid,account,nickname")->find();
         } else {