winter пре 2 година
родитељ
комит
8d3e2b277f
2 измењених фајлова са 3 додато и 2 уклоњено
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantBillVo.java

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java Прегледај датотеку

@@ -105,6 +105,7 @@ public class WxBillAllController extends BillBaseController {
wxMerchant.setId(-1L); wxMerchant.setId(-1L);
} }
} }
wxMerchant.setId(458559063314927616L);
PageInfo<WxMerchant> merchantPage = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); PageInfo<WxMerchant> merchantPage = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize);
if (null != merchantPage && null != merchantPage.getList() && merchantPage.getList().size() > 0 ) { if (null != merchantPage && null != merchantPage.getList() && merchantPage.getList().size() > 0 ) {
List<WxMerchantBillVo> retList = new ArrayList<WxMerchantBillVo>(); List<WxMerchantBillVo> retList = new ArrayList<WxMerchantBillVo>();


+ 2
- 2
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; private Date minDate;
@Excel(name = "账单最大日期", width = 20, orderNum = "8")
@Excel(name = "账单最大日期",format="yyyy-MM-dd", width = 20, orderNum = "8")
private Date maxDate; private Date maxDate;
@TableField(exist = false) @TableField(exist = false)


Loading…
Откажи
Сачувај