From f4c8c73bc5181b6d3265c6a0ce19ae13c600baa3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 九月 2025 12:07:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ReassignMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ReassignMapper.xml b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ReassignMapper.xml
index 0c34acd..4404126 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ReassignMapper.xml
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ReassignMapper.xml
@@ -66,7 +66,8 @@
         select
         money as amount,
         DATE_FORMAT(insertTime, '%Y-%m-%d% %H:%i') as `day`,
-        ('改派处罚') as name
+        ('改派处罚') as name,
+        remark
         from t_reassign where payTime is not null and originalDriverId = #{uid} order by insertTime desc limit #{pageNum}, #{size}
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.7.1