1:解决冲突

2018-12-24 22:31:42 +06:00
parent b4fcccddaf ac5d0cc739
commit ef41d65373
8 changed files with 10 additions and 8 deletions
--- a/src/main/java/com/nis/web/service/restful/DashboardService.java
+++ b/src/main/java/com/nis/web/service/restful/DashboardService.java
@@ -580,6 +580,7 @@ public class DashboardService extends BaseService {
 	 * @return
 	 */
 	public List<HashMap> ipActiveOneHour(Date beginDate, Date endDate) {
+
 //		TrafficIpActiveStatistic maxStatTime = trafficIpActiveStatisticDao.getMaxStatTime();
 		ArrayList<HashMap> listMap = new ArrayList<HashMap>();
 //		if (maxStatTime != null && maxStatTime.getStatTime() != null) {
@@ -599,6 +600,7 @@ public class DashboardService extends BaseService {
 //		}

 		return listMap;
+	
 	}

 	/**