From 0ac77765e57daac051a3800eea3348be6bc18355 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 24 Jul 2019 17:38:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=A1=A5=E8=B4=B4][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E8=A1=A5=E8=B4=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxMerchantSubsidyController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java index de6355bc9..dd65b5696 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java @@ -27,10 +27,10 @@ public class WxMerchantSubsidyController extends BaseController { @ApiOperation("补贴记录汇总") @GetMapping("sum") - public ResultData count(@ModelAttribute WxMerchantSubsidy wxMerchantSubsidy) { + public ResultData count(@ModelAttribute WxMerchantSubsidyVo wxMerchantSubsidy) { String ipStr = getIpAddr(); logger.info("subsidy/sum: " + ipStr + " :" + wxMerchantSubsidy.toString()); - if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidy(); + if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidyVo(); WxMerchantBUser user = getUser(); wxMerchantSubsidy.setTenantId(user.getTenantId()); wxMerchantSubsidy.setMerchantId(user.getMerchantId());