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

backend/config/urlmanager.php

@@ -145,8 +145,8 @@ return [
                     'extraPatterns'=>[
                         'GET,OPTIONS user-list' => 'user-list',
                         'GET,OPTIONS user-detail'=>'user-detail',
-                        'POST,OPTIONS user-update'=>'user-update',
-                        'GET,OPTIONS user-delete'=>'user-delete', 
+                        'POST user-update'=>'user-update',
+                        // 'GET,OPTIONS user-delete'=>'user-delete', 
                         'GET,OPTIONS get-member-grade-list'=>'get-member-grade-list',
                     ],
                 ],

backend/controllers/v1/shopuser/ShopUserListController.php

@@ -142,24 +142,14 @@ class ShopUserListController extends BaseController
             'data'=>$data
         ];
     }
-     /**
-     * @OA\GET(
-     *   path="/backend/web/v1/shopuser/shop-user-lists/user-delete",
-     *   tags={"用户&员工接口"},
-     *   summary="员工删除(张晓林)",
-     *   description="员工删除",
-     *   @OA\Parameter(name="GUID",description="用户GUID",in="query",@OA\Schema(type="string")),
-     *   @OA\Response(response="200",description="操作成功"),
-     *   security={{"Authorization": {}}}
-     * )
-     */
-
-    public function actionUserDelete(){
-        $param = Yii::$app->request->get();
-        $model = new $this->modelClass();
-        $result = $model->userDelete($param);
-        return $result;
-    }
+   
+    //用户删除湖接口，暂时不需要
+    // public function actionUserDelete(){
+    //     $param = Yii::$app->request->get();
+    //     $model = new $this->modelClass();
+    //     $result = $model->userDelete($param);
+    //     return $result;
+    // }
   /**
      *  @OA\POST(
      *     path="/backend/web/v1/shopuser/shop-user-lists/user-update",