From 77870599e51385355f110aeffc9e6d1c42f1cea0 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期六, 03 十一月 2018 11:41:05 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-traffic-statistics1.jsp | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-traffic-statistics1.jsp b/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
index 6d1c1ff..d524359 100644
--- a/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
+++ b/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
@@ -37,6 +37,7 @@
<tr class="layui-page-filter-tbl-header layui-page-filter-fweight">
<td>鐪�</td> <!-- 鐪� -->
<td>甯�</td> <!-- 甯� -->
+ <td>鍖�/鍘�</td> <!-- 甯� -->
<td><s:text name="Computer_name"/></td> <!-- 鏈烘埧鍚嶇О -->
<td>缁熻鏂瑰紡</td>
<td colspan="2">鏃堕棿娈�</td>
--
Gitblit v1.9.1