diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java index 1b9439691..3007a0094 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java @@ -53,6 +53,14 @@ public class WxMerchantTradeDailyVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") private String merchantName; + public String getbUserName() { + return bUserName; + } + + public void setbUserName(String bUserName) { + this.bUserName = bUserName; + } + @Excel(name = "操作人", width = 20, orderNum = "6") @io.swagger.annotations.ApiModelProperty(value = "b端用户姓名", name = "bUserName") private String bUserName; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index 60e7dc33d..4ae5df1ba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -185,7 +185,6 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ wxMerchantTradeDaily.setTenantId(wxMerchantTradeDailyVo.getTenantId()); wxMerchantTradeDaily.setMerchantId(wxMerchantTradeDailyVo.getMerchantId()); List list = wxMerchantTradeDailyMapper.findListVoOfMonth(wxMerchantTradeDaily); - list.parallelStream().forEach(t -> t.setMerchantName(null)); String title = "近30天解单数据"; if (!list.isEmpty()) { String merchantName = list.get(0).getMerchantName();