Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-12-17 cfa4a3fdb3dcd9a811157c4bd8f82ba4025917bc

 north-glass-erp/src/main/resources/mapper/userInfo/User.xml

@@ -78,4 +78,10 @@
        set password=#{passWord},update_time=now()
        where id=#{id}
    </update>

    <update id="updateUserNameById">
        update erp_user_info.user
        set user_name=#{userName},update_time=now()
        where id=#{id}
    </update>
</mapper>