记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit d472ce7c authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 0d71632b f4acd7bd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 302 additions and 140 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformanceCalendarController.java
View file @ d472ce7c
...@@ -47,6 +47,7 @@ public class PerformanceCalendarController extends BaseController{ ...@@ -47,6 +47,7 @@ public class PerformanceCalendarController extends BaseController{
//获取开始结束间隔天数 //获取开始结束间隔天数
List<PerformanceCalendarResp> respList = this.getPerformanceList(performanceCalendarReq); List<PerformanceCalendarResp> respList = this.getPerformanceList(performanceCalendarReq);
mmap.put("currentDate",LocalDate.now());
mmap.put("requestParam",performanceCalendarReq); mmap.put("requestParam",performanceCalendarReq);
mmap.put("respDataList",respList); mmap.put("respDataList",respList);
return prefix + "/performanceCalendar"; return prefix + "/performanceCalendar";
......
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