Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management

tangzy

2021-07-21 53675c635822794dbd79f0d0197c955af29c688f

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

@@ -207,4 +207,9 @@
    */
   UserVO platformDetail(User user);
   void updateUser(String hold,String cardid);

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