From 8837ac5f58c819db4216f4c46a0852e28d73da50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 12 Mar 2025 11:16:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/controller/admin/ShopMerchantController.java | 1 - .../service/account/service/impl/ShopMerchantServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java index 54b4ca5c8..33ab62e4a 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java @@ -43,7 +43,6 @@ public class ShopMerchantController { @SaAdminCheckPermission(value = "shopMerchant:edit", name = "商户支付信息修改") @PutMapping public CzgResult edit(@RequestBody @Validated ShopMerchantEditDTO shopMerchantEditDTO) { - shopMerchantEditDTO.setShopId(StpKit.USER.getLoginIdAsLong()); return CzgResult.success(shopMerchantService.edit(shopMerchantEditDTO)); } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopMerchantServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopMerchantServiceImpl.java index 2f65260db..72c178e79 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopMerchantServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopMerchantServiceImpl.java @@ -31,7 +31,7 @@ public class ShopMerchantServiceImpl extends ServiceImpl