From 53d63ddb5c5590d00279d11f1cd0c4bef07545e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 7 Oct 2023 09:09:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A72.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mdp-form/src/main/java/com/mdp/form/mapper/FormFieldMapper.xml  | 2 +-
 .../src/main/java/com/mdp/form/service/FormFieldService.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormFieldMapper.xml b/mdp-form/src/main/java/com/mdp/form/mapper/FormFieldMapper.xml
index 226153b..f768d6e 100644
--- a/mdp-form/src/main/java/com/mdp/form/mapper/FormFieldMapper.xml
+++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormFieldMapper.xml
@@ -10,7 +10,7 @@
 
         </where>
         <!--下面双引号内可以添加默认排序，如果前端没有上传排序，将使用引号内的排序规则-->
-        ${@com.mdp.Util@trimOrderBy(ew.customSqlSegment,'order by res.seq_no asc')}
+        ${@com.mdp.Util@trimOrderBy(ew.customSqlSegment,'order by res.seq asc')}
         <!--下面双引号内可以添加默认分组，如果前端没有上传分组，将使用引号内的分组规则-->
         ${@com.mdp.Util@trimGroupBy(ew.customSqlSegment,'')}
     </select>
diff --git a/mdp-form/src/main/java/com/mdp/form/service/FormFieldService.java b/mdp-form/src/main/java/com/mdp/form/service/FormFieldService.java
index bf3dcad..201c520 100644
--- a/mdp-form/src/main/java/com/mdp/form/service/FormFieldService.java
+++ b/mdp-form/src/main/java/com/mdp/form/service/FormFieldService.java
@@ -65,7 +65,7 @@ public class FormFieldService extends BaseService<FormFieldMapper,FormField> {
 			if(formDef==null){
 				return null;
 			}
-			List<FormField> formFields = this.list(QueryTools.initQueryWrapper(FormField.class).eq("form_id",formId).orderByAsc("seq_no"));	//列出FormField列表
+			List<FormField> formFields = this.list(QueryTools.initQueryWrapper(FormField.class).eq("form_id",formId).orderByAsc("seq"));	//列出FormField列表
 			formDefVo.setFormDef(formDef);
 			formDefVo.setFormFields(formFields);
 			FormQx formQx=formQxService.getOne(QueryTools.initQueryWrapper(FormQx.class).eq("form_id",formId));