From c3ac3682cac1d5dc3f2310418502c1c96ffe5a7e Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期五, 07 二月 2025 11:02:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/resources/mapper/system/TFaultAreaDicMapper.xml | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TFaultAreaDicMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TFaultAreaDicMapper.xml
index 02f32c1..7702ec8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TFaultAreaDicMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TFaultAreaDicMapper.xml
@@ -6,11 +6,23 @@
<resultMap id="BaseResultMap" type="com.ruoyi.system.model.TFaultAreaDic">
<id column="id" property="id" />
<result column="fault_area_name" property="faultAreaName" />
+ <result column="sort_by" property="sortBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="create_by" property="createBy" />
+ <result column="update_by" property="updateBy" />
+ <result column="disabled" property="disabled" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, fault_area_name
+ id, fault_area_name,sort_by, create_time, update_time, create_by, update_by, disabled
</sql>
+ <select id="pageList" resultType="com.ruoyi.system.model.TFaultAreaDic">
+ SELECT <include refid="Base_Column_List"></include>
+ FROM t_fault_area_dic
+ WHERE disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ ORDER BY create_time DESC
+ </select>
</mapper>
--
Gitblit v1.7.1