Commit dc235eb9 by songyinghui

Merge branch 'feature-wm-data' into 'master'

feature: 结束时间兼容

See merge request !1626
parents 0408071c 013072b3
...@@ -94,7 +94,7 @@ public class MaterialStatisticsBaseQO extends BasePageInfo { ...@@ -94,7 +94,7 @@ public class MaterialStatisticsBaseQO extends BasePageInfo {
public String getEndDate() { public String getEndDate() {
if (StringUtils.isBlank(this.endDate)) { if (StringUtils.isBlank(this.endDate)) {
return DateUtil.dateToStr(new Date(), "yyyy-MM-dd"); return DateUtil.dateToStr(DateUtils.addDays(new Date(), -1), "yyyy-MM-dd");
} }
return endDate; return endDate;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment