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

xiangpei

2024-07-05 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce

 src/main/resources/mapper/UserEventLogMapper.xml

@@ -24,7 +24,7 @@
        limit 10
    </select>

    <select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.vo.admin.user.UserEventPageRequestVO">
    <select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.admin.user.UserEventPageRequestVO">
        select
        <include refid="Base_Column_List"/>
        from t_user_event_log