Merge branch 'develop' of http://192.168.10.125/galaxy/galaxy-service.git into develop

2018-12-18 06:05:28 +06:00
parent 579cd007c2 77b6873bd3
commit bfefa4af32
1 changed files with 1 additions and 1 deletions
--- a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml
+++ b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml
@@ -132,7 +132,7 @@ FROM
 		<if test="entranceId!=null">
 			and entrance_id=#{entranceId}
 		</if>
-		group by web_id order by uniqueNum
+		group by web_id order by unique_num
 	</select>
 	<select id="getDomainTrans" resultType="com.nis.domain.restful.dashboard.TrafficHttpFocusStatistic">
 		select 	stat_time time, unique_num count from traffic_http_focus_statistic t where