Merge remote-tracking branch 'origin/master'

zengh

2021-08-15 0cab6d8afcc97e8bc94ef200e24d8839281f44c8

 src/main/java/org/springblade/modules/system/service/IUserService.java

@@ -212,4 +212,10 @@
    * 自定义用户列表(只有保安员)
    */
   IPage<User> selectUserPageSecurity(IPage<User> page, User user, Long deptId, String s);

   /**
    * 查询所有未注销用户
    * @return
    */
   List<User> getAllUserList();
}