解决冲突

Signed-off-by: sunlei <sunlei@romens.cn>

backend/controllers/v1/BaseController.php

@@ -20,7 +20,7 @@ use backend\components\v1\authorizationFilter;
  * ),
  * @OA\Server(
  *   description="Api server",
- *   url="/guoyongzhi/weiShopNew",
+ *   url="/sunlei/weiShopNew",
  * ),
  * @OA\SecurityScheme(
  *   securityScheme="Authorization",

backend/controllers/v1/branch/BranchController.php

@@ -534,7 +534,8 @@ class BranchController extends BaseController
             
             if ($fileInfo['CODE']==200) {
                 // 文件上传成功
-                throw new HttpException(200);
+                return $fileInfo['INFO'];
+                // throw new HttpException(200);
             }else{
                 throw new HttpException(422);
             }