From 49c5117caef44d1e817d2ef701529dfaf1443467 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 16 六月 2025 16:20:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
index 6dba6d8..a1502ea 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
@@ -445,4 +445,14 @@
     public List<Shop> getShopBySysUserIds(@RequestBody BoardMemberTotalDto boardMemberTotalDto){
         return shopService.getShopBySysUserIds(boardMemberTotalDto.getUserIds());
     }
+
+    /**
+     * 根据经销商id查询加盟商ids
+     * @param shopId
+     * @return
+     */
+    @PostMapping("/shop/getFranchiseeIdsBYDealerId")
+    List<Shop> getFranchiseeIdsBYDealerId(@RequestBody Long shopId){
+        return shopService.getFranchiseeIdsBYDealerId(shopId);
+    }
 }

--
Gitblit v1.7.1