From 892d5ae49554c29bd55d90b7492d19f1a8e34a4c Mon Sep 17 00:00:00 2001
From: GAOANG <1140589958@qq.com>
Date: Wed, 9 Apr 2025 10:50:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9=EF=BC=9A=20?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE=E5=8F=96=E4=B8=BB=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=80=8C=E9=9D=9E=E6=B5=81=E7=A8=8B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/helper/generatorHelper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/helper/generatorHelper.ts b/src/utils/helper/generatorHelper.ts
index 0840b22..a1c1824 100644
--- a/src/utils/helper/generatorHelper.ts
+++ b/src/utils/helper/generatorHelper.ts
@@ -2591,7 +2591,7 @@ async function setForm(){
         data
       } = await get${pascalMainTableName}(formConfig.id);
       if (data) {
-        await formRef.value.setFormData({...data,...props.formModel})
+        await formRef.value.setFormData({...props.formModel, ...data})
       }
     }
     //新增