Merge branch 'development' of http://gitlab-ebiz.yiyao365.cn/newshop/newshopback into development

backend/controllers/v1/shopuser/ShopUserListController.php

@@ -40,7 +40,7 @@ class ShopUserListController extends BaseController
         $param = Yii::$app->request->get();
         $ShopUserList = new ShopUserList();
         $userList = $ShopUserList->getUserList($param);
-        $data['userList'] = $userList;
+        $data['data'] = $userList;
         //获取所有用户组
         $data['memberGradeList'] = $this->getMemberGradeList();
         if(empty($userList)){
@@ -134,7 +134,18 @@ class ShopUserListController extends BaseController
      *   tags={"用户&员工接口"},
      *   summary="员工信息修改(张晓林)",
      *   description="用户信息更新",
-     *   @OA\Parameter(name="GUID",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="昵称",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="工号/手机号",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="积分",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="所属用户组",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="手机",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="性别",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="出生日期",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="员工工号",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="门店代码",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="会员卡号",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="会员标签",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="是否为惠氏分销商上级",in="query",@OA\Schema(type="string")),
      *   @OA\Response(response="200",description="操作成功"),
      *   security={{"Authorization": {}}}
      * )

backend/models/v1/shopuser/ShopUserList.php

@@ -76,7 +76,6 @@ class ShopUserList extends BaseModel{
             ]
         );
         $data = $provider->getModels();
-        $data['TOTALCOUNT'] = $provider->getTotalCount();
         return $data;
     }