Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

3 天以前 2d1e904f3049218474318cb1e2fe5c3a3869cfb0

 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