Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-19 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd

 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);