From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/RegionService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/RegionService.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/RegionService.java
index 5ba0fa6..36c2af0 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/RegionService.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/RegionService.java
@@ -18,7 +18,9 @@
     /**
      * 收货地址省市区二级联动
      *
+     * @param cityCodeList 城市编码列表
      * @return 无限级树
      */
-    List<Region> addressTree();
+    List<Region> addressTree(List<String> cityCodeList);
+    List<Region> addressTree1(List<String> cityCodeList);
 }

--
Gitblit v1.7.1