From c02e430f16cb51cabb6f4b24f99ec48efc7b0596 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 11:59:20 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/batt-traffic-statistics.jsp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-traffic-statistics.jsp b/gx_tieta/WebRoot/batt-traffic-statistics.jsp
index 564455a..2bb4ffb 100644
--- a/gx_tieta/WebRoot/batt-traffic-statistics.jsp
+++ b/gx_tieta/WebRoot/batt-traffic-statistics.jsp
@@ -399,7 +399,7 @@
 						arrTd[Index++] = data[i].note;
 						arrTd[Index++] = data[i].stationName1;
 						arrTd[Index++] = data[i].stationName2;
-						arrTd[Index++] = data[i].stationName3;
+						arrTd[Index++] = data[i].stationName;
 						arrTd[Index++] = tranfficCount(data[i].nowflow);			
 					}			
 					//console.info(arrTd);

--
Gitblit v1.9.1