From 3ed02f1626f0d7bd9a116f39d08e6cca3cbd4a0a Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Sun, 18 Jun 2023 22:44:38 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8818=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/modules/kc/statistics/TingKeStatisticsController.java  | 1 -
 .../java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java
index 37bbee73..37c7df83 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java
@@ -185,7 +185,6 @@ public class TingKeStatisticsController {
                     x.setXqxn(hx.getTitle());
                 }
             } );
-
         });
 
         return pageList;
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml
index 6503d262..9866967e 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml
@@ -505,6 +505,7 @@
             </if>
 
         </where>
+        ORDER BY tkrq desc,shijian desc
         <if test="pageSize != -1 and pageSize != null">
             LIMIT #{pageSize}
         </if>