From d8cf4b3db03a4a4c2d12ef21eaec78cb7d3b10d1 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 20 五月 2026 09:22:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_山西_晋和园_pro

---
 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