From ff1dcdad798b3fd484439e8a87a4d0ac75ab5720 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 25 七月 2025 16:30:08 +0800
Subject: [PATCH] Merge branch 'dev_ztns' into dev_ywx_ztns
---
cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml b/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml
index 1707e9d..8a5e3cf 100644
--- a/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml
+++ b/cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml
@@ -44,7 +44,8 @@
and dr.device_id = #{deviceId}
</if>
<if test="exportDate != '' and exportDate != null">
- and DATE_FORMAT(dr.use_start_date, '%Y-%m') = #{exportDate};
+ and DATE_FORMAT(dr.use_start_date, '%Y-%m') = #{exportDate}
</if>
+ ORDER BY dr.use_start_date asc
</select>
</mapper>
--
Gitblit v1.9.3