From f55be3227bfe7dfa13c45d014d6fc8cfc16dff42 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 21 十一月 2018 10:08:12 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/WebRoot/elewarn.jsp b/gx_tieta/WebRoot/elewarn.jsp
index be53d63..f93d040 100644
--- a/gx_tieta/WebRoot/elewarn.jsp
+++ b/gx_tieta/WebRoot/elewarn.jsp
@@ -82,7 +82,7 @@
 					<td>
 						<table>
 							<tr>
-								<input type="hidden" name="bmd.mainf.usr_id" value="0" class="119001"/>		<!-- 鍦ㄧ嚎鐢靛帇 -->
+								<td><input type="checkbox" checked="checked" name="bmd.mainf.usr_id" value="119001" class="119001"/><s:text name="On-line_voltage"/></td>		<!-- 鍦ㄧ嚎鐢靛帇 -->
 								<td><input type="checkbox" checked="checked" name="bmd.mainf.fault_type_id" value="119002" class="119002"/><s:text name="Group_voltage"/></td>		<!-- 缁勭鐢靛帇 -->
 								<td><input type="checkbox" checked="checked" name="bmd.mainf.fault_level" value="119003" class="119003"/><s:text name="Charging_current"/></td>	<!-- 鍏呯數鐢垫祦 -->
 								<td><input type="checkbox" checked="checked" name="bmd.mainf.record_uid" value="119004" class="119004"><s:text name="Discharge_current"/></td>		<!-- 鏀剧數鐢垫祦 -->

--
Gitblit v1.9.1