Merge remote-tracking branch 'origin/master'

linwei

2024-01-17 f5539e2f8e35d7e53abf54409245c5c7f9d2a72a

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

@@ -68,8 +68,7 @@
    * @return
    */
   @MapKey(value = "id")
    Map<String, TreeStringNode> getTreeList(@Param("parentCode") String parentCode,
                                 @Param("regionCode") String regionCode);
    Map<String, TreeStringNode> getTreeList(@Param("region") RegionVO region);

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