From 766a8c86a4eddf9f223b9db1daca07c1ea5508d0 Mon Sep 17 00:00:00 2001
From: lujiang <ljxuzhou@163.com>
Date: Wed, 12 Feb 2025 17:12:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=AF=BC=E5=87=BA=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=8A=20=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/excel/会情表导出模版.xls   | Bin 24064 -> 24064 bytes
 .../admin/MeetingReservationIOMapper.xml      |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/shoot-hand/ics-admin/src/main/resources/excel/会情表导出模版.xls b/shoot-hand/ics-admin/src/main/resources/excel/会情表导出模版.xls
index 15789c4b3121ffdc57942347a3c06a5927303222..36ed83644c25a5fef9dd0833e0f47f1deffd7351 100644
GIT binary patch
delta 309
zcmZqJ!`QHgaYGIZ8$-c09<AERMJ#QM6`Oyua9cAPPG)tm7r(*6&%p5E0t*8Wuzgqo
zq63&1rfiOOn9VZTfQ4i7H<x3RkGraKvoJ79`LFBd4f#+x`JHPgqr&7qccaNK-QF_F
zfmy5Eco^luEKUy*#)8Rm9>$Cgn}a-T7@em|xHB*@urSmz@Gvj~p@j&7&jJ*GEQ;W>
zGO#i*2qO4w3~USx`fi&qdP*~L`Y=GC_vEi$#*Ds`HNDLl{U#@RH}VHEa06Zbmw^jt
z5i^7P<d5FcKrueJ7#l;tW@#T07Csh`c?^s|TY)UL&9(u%88-zzU}bCQ=mdt(=4atj
FYyeZ<NihHb

delta 308
zcmZqJ!`QHgaYGIZTfsj4&ZwHnMJ#QM1)G1ea9cBKPG)tm7r(&5&%p5E1PcQYuzgqn
zqJ5YcCU1^*n9VZzpUW{0DgSldydfVdCm(dx;$UK6WRHB2BRjdl&1kZLoB!nb?)IDO
z-4qxZ<-tON9wLkxlhr(o87($PdDt*IGw8c9Ffp(&)H3ieFazOK33oW31t@MIg5a|<
zurfRrMex}e*cccD-8bL#lxF1gX7GW)$$!0!8T}?3dYd!)PR{gh<PTur20HpL0~gR>
zW`@AYKfR^--5L1cVr&e7o0WY;SooNL3K$p|fg}(zZFUXV%{bYBg=16D16DSM*;_iI
LYBoO$mtq3|Ld-~8

diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationIOMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationIOMapper.xml
index bbe239b..068d71d 100644
--- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationIOMapper.xml
+++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationIOMapper.xml
@@ -18,7 +18,7 @@
         <if test="device != null  and device != ''"> AND room.device LIKE CONCAT('%', #{device}, '%')</if>
         <if test="capacityNum != null"> AND capacity_num &lt;= #{capacityNum}</if>
         <if test="filterDate != null and filterDate != ''"> AND start LIKE CONCAT(#{filterDate}, '%')</if>
-        order by start
+        order by room.room_num,start
     </select>
 
     <select id="total" resultType="com.ics.admin.vo.MeetingTotalVo">