springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -156,9 +156,8 @@ */ @ApiOperation(value = "删除便民服务商家") @DeleteMapping("/merchant/delete") public R deleteMerchant(@RequestParam("merchantId") String merchantId, @RequestParam("operator") String operator) { return jinhuiCommunityService.deleteMerchant(merchantId, operator); public R deleteMerchant(@RequestParam("merchantId") String merchantId) { return jinhuiCommunityService.deleteMerchant(merchantId); } /**