Merge remote-tracking branch 'origin/master'

cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java

@@ -24,13 +24,14 @@ public class ShopMerchantController {
     /**
      * 商户支付信息获取
      * 权限标识: shopMerchant:detail
+     * @param shopId 店铺id
      * @return 支付信息
      */
     @SaAdminCheckRole("管理员")
     @SaAdminCheckPermission(value = "shopMerchant:detail", name = "商户支付信息获取")
     @GetMapping
-    public CzgResult<ShopMerchant> detail() {
-        return CzgResult.success(shopMerchantService.detail());
+    public CzgResult<ShopMerchant> detail(@RequestParam Integer shopId) {
+        return CzgResult.success(shopMerchantService.detail(shopId));
     }
 
     /**
@@ -42,7 +43,6 @@ public class ShopMerchantController {
     @SaAdminCheckPermission(value = "shopMerchant:edit", name = "商户支付信息修改")
     @PutMapping
     public CzgResult<Boolean> edit(@RequestBody @Validated ShopMerchantEditDTO shopMerchantEditDTO) {
-        shopMerchantEditDTO.setShopId(StpKit.USER.getLoginIdAsLong());
         return CzgResult.success(shopMerchantService.edit(shopMerchantEditDTO));
     }
 }