diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index 482ffc25f..68d55de6a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -105,6 +105,7 @@ public class WxBillAllController extends BillBaseController { wxMerchant.setId(-1L); } } + wxMerchant.setId(458559063314927616L); PageInfo merchantPage = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); if (null != merchantPage && null != merchantPage.getList() && merchantPage.getList().size() > 0 ) { List retList = new ArrayList(); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java index 8e04c6322..2a4b3f125 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java @@ -51,10 +51,10 @@ public class WxMerchantBillVo implements Serializable { } - @Excel(name = "账单最小日期", width = 20, orderNum = "7") + @Excel(name = "账单最小日期",format="yyyy-MM-dd", width = 20, orderNum = "7") private Date minDate; - @Excel(name = "账单最大日期", width = 20, orderNum = "8") + @Excel(name = "账单最大日期",format="yyyy-MM-dd", width = 20, orderNum = "8") private Date maxDate; @TableField(exist = false)