Merge remote-tracking branch 'origin/master' into develop

kustomization/overlays/prod/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/admin
-  newTag: 52bc46b4c275e1531b86c5da46972c6af3093aba
+  newTag: 2d41cbb6167bbf8eb38b821f5fd45b8846f4a744

src/components/goods/commonAddOrEdit/addOrEditSkuModal/index.tsx

@@ -380,7 +380,7 @@ const AddOrEditSkuModal: React.FC<ModalProps & selfProps> = ({
                 specImage: i.specImage,
                 productSpecCPQVO: i.productSpecCPQVO,
                 fileList: i.fileList,
-                id: i.productSpec || i.id,
+                id: i.id,
                 productSkuId: curtRowData && curtRowData.skuId,
               };
             });

src/pages/mallManage/mallGoods/goodsAddOrEditOrDetail/index.tsx

@@ -201,11 +201,13 @@ const GoodsAddOrEditOrDetail = () => {
       const goodsSpecVO: specEntity[] = specData.reduce((pre: any, cur: specEntity) => {
         cur.customizeInfo = cur.customizeInfo?.reduce((cusPre: any, cusCur: customizeEntity) => {
           const bol: boolean = goodsSpecCopy.some((i: specEntity) => {
-            return i.customizeInfo?.some((i: customizeEntity) => i.productSpec === cusCur.id);
+            return i.customizeInfo?.some((i: customizeEntity) => i.id === cusCur.id);
           });
           cusPre = [
             ...cusPre,
-            bol ? filterObjAttr(cusCur, ['fileList']) : filterObjAttr(cusCur, ['id', 'fileList']),
+            bol
+              ? filterObjAttr({ ...cusCur, id: cusCur.productSpec }, ['fileList'])
+              : filterObjAttr(cusCur, ['id', 'fileList']),
           ];
           return cusPre;
         }, []);