Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

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

@@ -110,4 +110,18 @@

    List<UserDistrictStatisVO> getUserDistrictTypeCount();

   /**
    * 查询用户数据,未删除的,未审核的
    * @return
    */
   List<User> getNotAuditAllUserList();


   /**
    * 查询账号相同的用户数量
    * @param account
    * @return
    */
   Integer selectCountAccount(@Param("account") String account);

}