Merge branch 'dev_New_pro' into dev_平遥县盛达铸造厂

gongchunyi

2026-07-07 72a32c227fdf10f34fe563a7de35169da5729eea

 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