Skip to content

N
newShopBack
Commit c6d5dc7a authored by 孙磊's avatar 孙磊
Browse files
Options

conflict解决 

Signed-off-by: 孙磊's avatarsunlei <sunlei@romens.cn>
parent 9dd55ea4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
backend/controllers/v1/BaseController.php
View file @ c6d5dc7a
...@@ -22,7 +22,7 @@ use backend\components\v1\authorizationFilter; ...@@ -22,7 +22,7 @@ use backend\components\v1\authorizationFilter;
* ), * ),
* @OA\Server( * @OA\Server(
* description="Api server", * description="Api server",
* url="/yaoshuxia/shopback", * url="/guoyongzhi/weiShopNew",
* ), * ),
* @OA\SecurityScheme( * @OA\SecurityScheme(
* securityScheme="Authorization", * securityScheme="Authorization",
...@@ -60,7 +60,7 @@ class BaseController extends ActiveController ...@@ -60,7 +60,7 @@ class BaseController extends ActiveController
public $serializer = [ public $serializer = [
'class' => 'yii\rest\Serializer', 'class' => 'yii\rest\Serializer',
'collectionEnvelope' => 'data', 'collectionEnvelope' => 'data',
'preserveKeys'=>true, 'preserveKeys' => true,
]; ];
public function behaviors() public function behaviors()
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment