Merge remote-tracking branch 'origin/master'

fuliqi

2024-06-03 6c87a7ad0ae6ae9b5d8b6ab4d0e5b93169171972

 src/main/resources/mapper/UserMapper.xml

@@ -92,7 +92,7 @@
    </select>


    <select id="userPage" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.vo.admin.user.UserPageRequestVO">
    <select id="userPage" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.admin.user.UserPageRequestVO">
        SELECT
        <include refid="Base_Column_List"/>
        FROM t_user