Merge branch 'master' into feature/2151-translate

frontendApi/modules/v1/controllers/UserController.php

@@ -674,7 +674,7 @@ class UserController extends BaseController {
         }
 
         // 只查询普通商品
-        $allGoods = ShopGoods::find()->where("ID='399659569762144384'")->orderBy('SORT ASC')->asArray()->all();
+        $allGoods = ShopGoods::find()->where("ID='375895243322691584'")->orderBy('SORT ASC')->asArray()->all();
         if (!$userName) {
             return static::notice('Failed to generate member number', 400); // 会员编号生成失败
         }