Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/district/mapper/DistrictMapper.java

@@ -40,7 +40,10 @@
    * @param district
    * @return
    */
   List<DistrictVO> selectDistrictPage(IPage page,@Param("district") DistrictVO district);
   List<DistrictVO> selectDistrictPage(IPage page,
                              @Param("district") DistrictVO district,
                              @Param("regionChildCodesList") List<String> regionChildCodesList,
                              @Param("isAdministrator") Integer isAdministrator);

   /**
    * 获取小区树