conflict解决

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

conflict解决
Signed-off-by: sunlei <sunlei@romens.cn>
c6d5dc7a · 孙磊 · 9dd55ea4 · c6d5dc7a
Commit c6d5dc7a authored Jan 02, 2020 by 孙磊
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

BaseController.php backend/controllers/v1/BaseController.php +2 -2

No files found.
--- a/backend/controllers/v1/BaseController.php
+++ b/backend/controllers/v1/BaseController.php
@@ -22,7 +22,7 @@ use backend\components\v1\authorizationFilter;
 * ),
 * @OA\Server(
 *   description="Api server",
- *   url="/yaoshuxia/shopback",
+ *   url="/guoyongzhi/weiShopNew",
 * ),
 * @OA\SecurityScheme(
 *   securityScheme="Authorization",
@@ -60,7 +60,7 @@ class BaseController extends ActiveController
    public $serializer = [
        'class' => 'yii\rest\Serializer',
        'collectionEnvelope' => 'data',
-        'preserveKeys'=>true,
+        'preserveKeys' => true,
    ];
    public function behaviors()
    {