From acf7627f5c57d62fd7d93dd9794911c6e7b4e42f Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期五, 19 十月 2018 14:15:51 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/equipWarn1.jsp |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/WebRoot/equipWarn1.jsp b/gx_tieta/WebRoot/equipWarn1.jsp
index a17a5b7..e2fa7c9 100644
--- a/gx_tieta/WebRoot/equipWarn1.jsp
+++ b/gx_tieta/WebRoot/equipWarn1.jsp
@@ -116,6 +116,13 @@
                                 	<option value="618502">閫氳鍛婅</option>
                                 	<option value="618503">璁惧杩囨俯鍛婅</option>
                                 	<option value="618504">浜屾瀬绠1鍛婅</option>
+                                	
+                                	<option value="119023">缁埅涓嶈冻鍛婅</option>
+                                	<option value="119024">鍩虹珯鍋滅數鍛婅</option>
+                                	<option value="119025">鍩虹珯鍙戠數鍛婅</option>
+                                	<option value="119026">鍩虹珯鎺夌珯鍛婅</option>
+                                	<option value="119027">鍩虹珯寮�闂ㄥ憡璀�</option>
+                                	
                                 </select>
                             </td>
                         </tr>
@@ -723,6 +730,10 @@
 					case 618503:return "璁惧杩囨俯鍛婅";
 					case 618504:return "浜屾瀬绠1鍛婅";
 					case 119023:return "缁埅涓嶈冻鍛婅";
+					case 119024:return "鍩虹珯鍋滅數鍛婅";
+					case 119025:return "鍩虹珯鍙戠數鍛婅";
+					case 119026:return "鍩虹珯鎺夌珯鍛婅";
+					case 119027:return "鍩虹珯寮�闂ㄥ憡璀�";
 				}
 			}
 			return "閫氫俊鏁呴殰";

--
Gitblit v1.9.1