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

zhongrj

2023-04-24 684d583978a4f0d4b0bd88ad46ad2f6238d185c8

 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.java

@@ -18,6 +18,7 @@

import cn.gistack.system.user.entity.User;
import cn.gistack.system.user.excel.UserExcel;
import cn.gistack.system.user.vo.UserVO;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -60,4 +61,5 @@
    */
   List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);

    List<User> customizeGetList(@Param("user") UserVO user);
}