Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev

package.json

@@ -53,7 +53,7 @@
     "classnames": "^2.2.6",
     "core-js": "^3.6.5",
     "crypto-js": "^4.0.0",
-    "god": "^0.1.29",
+    "god": "^0.2.4",
     "lingxi-design": "^1.0.8",
     "lingxi-design-ui": "^1.1.15",
     "lingxi-editor-core": "^1.0.6",
@@ -75,8 +75,8 @@
     "connect-history-api-fallback": "^1.6.0",
     "cross-env": "^7.0.2",
     "express": "^4.17.1",
-    "god-upload-scp": "1.2.0",
-    "god-yapi2ts": "^1.9.0",
+    "god-upload-scp": "1.0.1",
+    "god-yapi2ts": "^1.0.0",
     "gulp": "^4.0.2",
     "http-proxy-middleware": "^1.0.5",
     "json2ts": "^0.0.7",

src/pages/pageCustomized/settingsPanel/propsSettings/components/GoodsSetting/index.tsx

@@ -87,7 +87,7 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
       pageSize: 100
     }
 
-    PublicApi.getTemplatePlatformFindBrandList(param).then((res: any) => {
+    PublicApi.getTemplateAdornWebEnterpriseFindBrandList(param).then((res: any) => {
       if (res.code === 1000) {
         const dataInfo = res.data
         setNoSelectBrands(dataInfo.data || [])