From e73ee4cf940ce406a016cb46e2f265d04cf9c6dc Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期六, 08 二月 2025 12:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun

---
 ruoyi-system/src/main/resources/mapper/system/TFaultAreaDicMapper.xml |    2 +-
 1 files changed, 1 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 7702ec8..cb2bf60 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TFaultAreaDicMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TFaultAreaDicMapper.xml
@@ -22,7 +22,7 @@
         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
+        ORDER BY sort_by,create_time DESC
     </select>
 
 </mapper>

--
Gitblit v1.7.1