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