Merge remote-tracking branch 'origin/dev' into dev

无关风月

9 天以前 f135f2c8c08b16ac25a4e8e0398418ab3ce1e620

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/RegionService.java

@@ -22,4 +22,5 @@
     * @return 无限级树
     */
    List<Region> addressTree(List<String> cityCodeList);
    List<Region> addressTree1(List<String> cityCodeList);
}