From cdd012c2fe553d333bda32100e0b67cc7304cba4 Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Thu, 15 Jan 2026 10:23:29 +0800
Subject: [PATCH] =?UTF-8?q?shopid=20=E4=B8=BA1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/controller/admin/ShopMerchantController.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java
index 6c8a96f0b..cb1bc0b61 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java
@@ -45,7 +45,6 @@ public class ShopMerchantController {
     @SaAdminCheckPermission(parentName = "支付参数信息", value = "shopMerchant:edit", name = "商户支付信息修改")
     @PutMapping
     public CzgResult<Boolean> edit(@RequestBody ShopMerchantDTO shopMerchant) {
-        shopMerchant.setShopId(StpKit.USER.getShopId());
         return CzgResult.success(shopMerchantService.editEntry(shopMerchant, true));
     }