Merge remote-tracking branch 'origin/master'

lin

2024-04-15 bdcca1cd1f1c4c5d7d187d74a7c75f1caac8b491

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

@@ -93,6 +93,12 @@
         }
         rotation.setPropertyFlag(1);
      }
      if(AuthUtils.isMj(userRole)){
         rotation.setType(1);
      }
      if(AuthUtils.isJd(userRole)){
         rotation.setType(2);
      }
      if (StringUtils.isNotBlank(rotation.getAoiCode())) {
         // 查询房屋的小区
         IDistrictService bean = SpringUtils.getBean(IDistrictService.class);