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

backend/controllers/v1/shopuser/ShopUserController.php

@@ -10,10 +10,6 @@ use yii\web\BadRequestHttpException;
 class ShopUserController extends BaseController
 {
     public $modelClass = 'app\models\v1\shopuser\ShopUser';
-    public $serializer = [
-        'class' => 'yii\rest\Serializer',
-        'collectionEnvelope' => 'data',
-    ];
 
     /**
      * @OA\GET(
@@ -21,11 +17,11 @@ class ShopUserController extends BaseController
      *   tags={"用户&员工接口"},
      *   summary="员工信息列表(侯贺政)",
      *   description="员工信息列表",
-     *   @OA\Parameter(name="page",in="query",@OA\Schema(type="int")),
-     *   @OA\Parameter(name="NAME",in="query",@OA\Schema(type="string")),
-     *   @OA\Parameter(name="EMPLOYEE_CODE",in="query",@OA\Schema(type="string")),
-     *   @OA\Parameter(name="MOBILEPHONE",in="query",@OA\Schema(type="string")),
-     *   @OA\Parameter(name="EMPLOYEE_BRANCH_GUID",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
+     *   @OA\Parameter(name="NAME",in="query",description="员工姓名",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="EMPLOYEE_CODE",in="query",description="员工编号",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="MOBILEPHONE",in="query",description="手机号",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="EMPLOYEE_BRANCH_GUID",description="用户所属门店GUID",in="query",@OA\Schema(type="string")),
      *   @OA\Response(response="200",description="
      *                GUID:用户GUID,
      *                NAME:姓名,
@@ -57,7 +53,7 @@ class ShopUserController extends BaseController
      *   tags={"用户&员工接口"},
      *   summary="员工信息(侯贺政)",
      *   description="某员工的信息详情",
-     *   @OA\Parameter(name="id",in="query",required=true,@OA\Schema(type="string")),
+     *   @OA\Parameter(name="id",in="query",required=true,description="员工GUID",@OA\Schema(type="string")),
      *   @OA\Response(response="200",description="
      *                GUID:用户GUID,
      *                NAME:姓名,

backend/controllers/v1/shopuser/UserComplainController.php

@@ -10,10 +10,10 @@ use yii\web\BadRequestHttpException;
 class UserComplainController extends BaseController
 {
     public $modelClass='app\models\v1\shopuser\UserComplain';
-    public $serializer = [
-        'class' => 'yii\rest\Serializer',
-        'collectionEnvelope' => 'usercomplain',
-    ];
+    // public $serializer = [
+    //     'class' => 'yii\rest\Serializer',
+    //     'collectionEnvelope' => 'usercomplain',
+    // ];
 /**
 * @OA\Get(
 *   path="/backend/web/v1/shopuser/user-complains/user-complain",

backend/controllers/v1/shopuser/UserDepartmentController.php

@@ -10,10 +10,10 @@ use yii\web\BadRequestHttpException;
 class UserDepartmentController extends BaseController
 {
     public $modelClass='app\models\v1\shopuser\UserDepartment';
-    public $serializer = [
-        'class' => 'yii\rest\Serializer',
-        'collectionEnvelope' => 'userdepartment',
-    ];
+    // public $serializer = [
+    //     'class' => 'yii\rest\Serializer',
+    //     'collectionEnvelope' => 'userdepartment',
+    // ];
 /**
  * @OA\Get(
  *   path="/backend/web/v1/shopuser/user-departments/department",

backend/models/v1/shopuser/UserComplain.php

@@ -91,7 +91,7 @@ class UserComplain extends BaseModel
             [
                 'query' => $query->asArray(),
                 'pagination' => [
-                    'pageSize' =>  5,
+                    'pageSize' =>  15,
                 ]
             ]
         );    

backend/models/v1/shopuser/UserDepartment.php

@@ -69,13 +69,12 @@ class UserDepartment extends BaseModel
 
         if (isset($code) && !empty($code)) {
             $query->andWhere(['like', 'CODE', $code]);
-        }  
-        
+        }
         return new ActiveDataProvider(
             [
                 'query' => $query->asArray(),
                 'pagination' => [
-                    'pageSize' =>  5,
+                    'pageSize' =>  15,
                 ]
             ]
         );