From 821ca9ad40883ce823fcf215b3b4f8bc07cc0e66 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 22 May 2023 21:25:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java |    2 +-
 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/RoleMapper.xml |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
index a86c969..1c4908a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
@@ -19,7 +19,7 @@
  * @author Chill
  */
 @Data
-@TableName("\"tb_res_base\"")
+@TableName("\"att_res_base\"")
 @ApiModel(value = "水库对象", description = "水库对象")
 public class AttResBase implements Serializable {
 	private static final long serialVersionUID = 1L;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/RoleMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/RoleMapper.xml
index 885a839..d1e9b06 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/RoleMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/RoleMapper.xml
@@ -32,6 +32,7 @@
         <if test="param2!=null  and param2!=''">
             and role_alias &lt;&gt; #{param2}
         </if>
+        ORDER BY sort
     </select>
 
     <select id="treeByParentId" resultMap="treeNodeResultMap">

--
Gitblit v1.9.3