From f6bfafc3a6cd50f11fbf498ecf21498bd9112ff4 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期二, 08 一月 2019 17:37:51 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/equipWarn1.jsp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/equipWarn1.jsp b/gx_tieta/WebRoot/equipWarn1.jsp
index 75e4f7a..9efbf68 100644
--- a/gx_tieta/WebRoot/equipWarn1.jsp
+++ b/gx_tieta/WebRoot/equipWarn1.jsp
@@ -114,7 +114,7 @@
<select id="alarm_type">
<option value="0">鍏ㄩ儴</option>
<option value="119020">閫氫俊鏁呴殰</option>
- <option value="618501">缁х數鍣ㄥ憡璀�</option>
+ <!-- <option value="618501">缁х數鍣ㄥ憡璀�</option>
<option value="618502">閫氳鍛婅</option>
<option value="618503">璁惧杩囨俯鍛婅</option>
<option value="618504">浜屾瀬绠1鍛婅</option>
@@ -122,7 +122,7 @@
<option value="119024">鍩虹珯鍋滅數鍛婅</option>
<option value="119025">鍩虹珯鍙戠數鍛婅</option>
<option value="119026">鍩虹珯鎺夌珯鍛婅</option>
- <option value="119027">鍩虹珯寮�闂ㄥ憡璀�</option>
+ <option value="119027">鍩虹珯寮�闂ㄥ憡璀�</option> -->
<option value ="119028">璁惧楂樻俯鍛婅</option>
<option value ="119032">璁惧SD鍗℃晠闅�</option>
<option value ="119033">閲囬泦绾垮憡璀�</option>
--
Gitblit v1.9.1