From 16f44651a78d00943aea51b26fc6a4f20518a648 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 15 Jan 2021 16:29:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/org/springblade/modules/jingdan/mapper/JingdanMapper.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/jingdan/mapper/JingdanMapper.xml b/src/main/java/org/springblade/modules/jingdan/mapper/JingdanMapper.xml
index 1135f6a..8f96bfc 100644
--- a/src/main/java/org/springblade/modules/jingdan/mapper/JingdanMapper.xml
+++ b/src/main/java/org/springblade/modules/jingdan/mapper/JingdanMapper.xml
@@ -49,6 +49,7 @@
<if test="type!=null and type!=''">
and j.type=#{type}
</if>
+ ORDER BY j.type asc,j.galarmTime desc
</select>
<select id="selectdInfo" resultMap="jingdanResultMap">
--
Gitblit v1.9.3