Merge branch 'master' of http://18.167.157.193:1026/guanli/ngds

backendApi/modules/v1/controllers/ShopController.php

@@ -111,7 +111,7 @@ class ShopController extends BaseController {
             $formModel = new ShopGoodsForm();
             $formModel->scenario = 'add';
             if ($formModel->load(\Yii::$app->request->post(), '') && $result = $formModel->add()) {
-                return static::notice('商品添加成功');
+                return static::notice('Product add succeeded.');
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()),400);
             }
@@ -137,7 +137,7 @@ class ShopController extends BaseController {
             $formModel->scenario = 'edit';
             $formModel->id = $id;
             if ($formModel->load(\Yii::$app->request->post(), '') && $result = $formModel->edit()) {
-                return static::notice('商品编辑成功');
+                return static::notice('Product editing succeeded.');
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()),400);
             }