Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/goods/goods/index.vue

@@ -367,15 +367,12 @@
       toAdd() {
         this.viewState = 2
         var orgSid = ''
-        getOrgSidByPath({
-          orgPath: window.sessionStorage.getItem('defaultOrgPath')
-        }).then((res) => {
+        getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
           if (res.success) {
             orgSid = res.data
+            this.$refs['divadd'].showAdd(window.sessionStorage.getItem('userSid'), orgSid, window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1))
           }
         })
-        this.$refs['divadd'].showAdd(window.sessionStorage.getItem('userSid'), orgSid, window.sessionStorage.getItem(
-          'defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1))
       },
       toEdit() {
 

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java

@@ -447,7 +447,7 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
                 sku.setGoodsSkuCode(dto.getGoodsCode());
             }
             if (StringUtils.isNotBlank(dto.getIndexes())) {
-                sku.setIndexes(dto.getIndexes());
+                sku.setOwnSpec(dto.getIndexes());
             }
             baseGoodsSkuService.insert(sku);
             //商品sku_extend