From edb9e5896c8af325488661e4af246841486d7030 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 29 一月 2026 15:58:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/resources/mapper/safe/SafeAccidentMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/safe/SafeAccidentMapper.xml b/src/main/resources/mapper/safe/SafeAccidentMapper.xml
index 63e9067..c7dc368 100644
--- a/src/main/resources/mapper/safe/SafeAccidentMapper.xml
+++ b/src/main/resources/mapper/safe/SafeAccidentMapper.xml
@@ -27,7 +27,7 @@
     </resultMap>
     <select id="pageSafeAccident" resultType="com.ruoyi.safe.pojo.SafeAccident">
         select sa.*,
-               su.nick_name createUserName,
+               su.nick_name createUserName
         from safe_accident sa
         left join sys_user su on sa.create_user = su.user_id
         where 1=1

--
Gitblit v1.9.3