Merge remote-tracking branch 'origin/master'

lin

2024-05-09 b822ea020a6d4edec0d183af32532076cdca062c

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

@@ -51,7 +51,9 @@
    * @return
    */
   @MapKey(value = "id")
    Map<String, TreeStringNode> getDistrictTree(@Param("district") DistrictVO district);
    Map<String, TreeStringNode> getDistrictTree(@Param("district") DistrictVO district,
                                    @Param("regionChildCodesList") List<String> regionChildCodesList,
                                    @Param("isAdministrator") Integer isAdministrator);

   /**
    * 小区表 自定义获取详情