Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

2018-09-13 15:37:10 +08:00
parent 0869a02ad3 c7487d927f
commit 90b419e989
1 changed files with 1 additions and 1 deletions
--- a/src/main/java/com/nis/web/controller/report/NtcPzReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcPzReportController.java
@@ -86,7 +86,7 @@ public class NtcPzReportController extends BaseController{
 			}
 			Calendar endTimeCal=Calendar.getInstance();
 			endTimeCal.setTimeInMillis(cal.getTimeInMillis());
-			endTimeCal.add(Calendar.SECOND, -1);
+			//endTimeCal.add(Calendar.SECOND, -1);
 			endDate=endTimeCal.getTime();
 			cal.add(Calendar.MINUTE, -interval);
 			startDate=cal.getTime();