diff --git a/shoot-hand/ics-admin/src/main/resources/excel/会情表导出模版.xls b/shoot-hand/ics-admin/src/main/resources/excel/会情表导出模版.xls index 15789c4..36ed836 100644 Binary files a/shoot-hand/ics-admin/src/main/resources/excel/会情表导出模版.xls and b/shoot-hand/ics-admin/src/main/resources/excel/会情表导出模版.xls differ 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 @@ AND room.device LIKE CONCAT('%', #{device}, '%') AND capacity_num <= #{capacityNum} AND start LIKE CONCAT(#{filterDate}, '%') - order by start + order by room.room_num,start