Merge remote-tracking branch 'origin/master'

zengh

2022-03-09 29d7fafb766ed9eec51da333cda5eb5de979647a

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

@@ -269,6 +269,8 @@
    * 统计六大队伍
    */
   List<UserRegisterStatisVO> getUserTypeCount();
   List<UserRegisterStatisVO> getUserTypeCountXq(String  xid);
   List<UserVO> getUserTypeList(String xid,String index);

   List<UserDistrictStatisVO> getUserDistrictTypeCount();