Merge remote-tracking branch 'origin/master'

linwe

2024-06-24 3e19054b66343df9138362f51bc7ca0f18ffbd68

 src/main/java/org/springblade/modules/rotation/service/impl/RotationServiceImpl.java

@@ -99,6 +99,9 @@
      if(AuthUtils.isJd(userRole)){
         rotation.setType(2);
      }
      if(AuthUtils.isAdministratorOrAdmin(userRole)){
         rotation.setType(null);
      }
      if (StringUtils.isNotBlank(rotation.getAoiCode())) {
         // 查询房屋的小区
         IDistrictService bean = SpringUtils.getBean(IDistrictService.class);