Merge remote-tracking branch 'origin/master'

linwei

2024-01-20 cb61acd5c6735788b68e1031e85a0dab244f40aa

 src/main/java/org/springblade/modules/system/mapper/RegionMapper.java

@@ -67,7 +67,9 @@
    * @return
    */
   @MapKey(value = "id")
    Map<String, TreeStringNode> getTreeList(@Param("region") RegionVO region);
    Map<String, TreeStringNode> getTreeList(@Param("region") RegionVO region,
                                 @Param("regionChildCodesList") List<String> regionChildCodesList,
                                 @Param("isAdministrator") Integer isAdministrator);

   /**
    * 树列表(获取当前树）