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

xiangpei

2024-06-25 8f20b8b0442e484220352455addc8c2e6945b153

 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