Merge remote-tracking branch 'origin/master'

Administrator

2021-09-18 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944

 src/main/java/org/springblade/modules/system/mapper/UserMapper.java

@@ -92,4 +92,11 @@
    * @return
    */
   List<User> selectUserPages(IPage<User> page,@Param("user") User user);

   /**
    * 根据保安员编码查询保安员信息
    * @param securityNumber
    * @return
    */
    UserVO getUserInfoBySecurityNumber(@Param("securityNumber") String securityNumber);
}