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

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 3bff7965b990c05ebcc4298bd4aea6b4281b4495
+  newTag: 30d9af6174715e13ed77cc481effe5e8307a061c

src/pages/mallManage/produceManage/produceDetail/index.tsx

@@ -87,7 +87,7 @@ function ProduceDetail() {
   };
   // 打开编辑弹窗
   const handleEdit = (record: specType[0]) => {
-    setAddEditData(record);
+    setAddEditData({ ...record });
     setAddOrEditProduceSpecModalShow(true);
   };
   // 关闭新增编辑弹窗
@@ -158,7 +158,7 @@ function ProduceDetail() {
   };
   //配置价格
   const handlePrice = (record: specType[0]) => {
-    setAddEditData(record);
+    setAddEditData({ ...record });
     setProduceSpecPriceModalShow(true);
   };
   const produceSpecPriceModalCancel = () => {