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

无关风月

4 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

 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);
}