From f18a802137a7642473891f6886d44cf0c229efed Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 11 一月 2025 18:09:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java
index e86f791..ff0a740 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java
@@ -45,8 +45,8 @@
 	@PostMapping("/shop/getShopByUserIds")
 	R<List<Shop>> getShopByUserIds(@RequestBody List<Long> userIds);
 
-	@GetMapping("/shop/getShopIdByName")
-    R<Set<Integer>> getShopIdByName(String shopName);
+	@PostMapping("/shop/getShopIdByName")
+    R<Set<Integer>> getShopIdByName(@RequestParam("shopName") String shopName);
 
 	@PostMapping("/shop-balance-statement/getList")
 	R<List<ShopBalanceStatement>> getShopBalanceStatementList(@RequestBody ShopBalanceStatement shopBalanceStatement);
@@ -57,4 +57,12 @@
 	 */
 	@PostMapping("/shop/updateShop")
 	void updateShop(Shop shop);
+
+
+	/**
+	 * 获取所有门店
+	 * @return
+	 */
+	@PostMapping("/shop/getAllShop")
+	R<List<Shop>> getAllShop();
 }

--
Gitblit v1.7.1