Merge remote-tracking branch 'origin/master'

16639036659

2023-07-13 aa9c34737dd81d3ed4ed05b5f52b7edd8d14dee2

 src/main/resources/mybatis/system/UserMapper.xml

@@ -285,4 +285,9 @@
    <select id="getUserByLoginName" parameterType="User" resultMap="UserResult">
        select * from sys_user where user_name = #{createBy}
    </select>

    <!--    User getUserByLoginName(String createBy);-->
    <select id="getUserByName" parameterType="User" resultMap="UserResult">
        select * from sys_user where login_name = #{createBy}
    </select>
</mapper>