Merge remote-tracking branch 'origin/master'

zengh

2021-03-23 ba0f00cf00c2a5c693e9608a56d1f7d032f5e216

 blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java

@@ -22,6 +22,7 @@
import org.apache.ibatis.annotations.Param;
import org.springblade.system.user.entity.User;
import org.springblade.system.user.excel.UserExcel;
import org.springblade.system.user.vo.UsersVo;

import java.util.List;

@@ -60,4 +61,10 @@
    */
   List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);

   /**
    * 查询处警人员列表
    * @param user  用户对象
    * @param page  分页
    */
    List<UsersVo> selectSecurityUserPageList(IPage<UsersVo> page, User user);
}