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

xiangpei

2024-07-12 e9c1bc2e789f6f9f8c52fbd10788ad5a0d1f841b

 src/main/java/com/ycl/jxkg/mapper/UserEventLogMapper.java

@@ -1,8 +1,9 @@
package com.ycl.jxkg.mapper;

import com.ycl.jxkg.domain.UserEventLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.entity.UserEventLog;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.vo.admin.user.UserEventPageRequestVO;
import com.ycl.jxkg.domain.vo.admin.user.UserEventPageRequestVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;