From b2f21d080425b0ab6e5e6170914ca2c615e5d185 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 02 一月 2019 10:22:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/WebRoot/equipWarn1.jsp b/gx_tieta/WebRoot/equipWarn1.jsp
index e12d711..75e4f7a 100644
--- a/gx_tieta/WebRoot/equipWarn1.jsp
+++ b/gx_tieta/WebRoot/equipWarn1.jsp
@@ -124,6 +124,8 @@
                                 	<option value="119026">鍩虹珯鎺夌珯鍛婅</option>
                                 	<option value="119027">鍩虹珯寮�闂ㄥ憡璀�</option>
                                 	<option value ="119028">璁惧楂樻俯鍛婅</option>
+                                	<option value ="119032">璁惧SD鍗℃晠闅�</option>
+                                	<option value ="119033">閲囬泦绾垮憡璀�</option>
                                 	
                                 </select>
                             </td>
@@ -740,6 +742,8 @@
 					case 119026:return "鍩虹珯鎺夌珯鍛婅";
 					case 119027:return "鍩虹珯寮�闂ㄥ憡璀�";
 					case 119028:return "璁惧楂樻俯鍛婅";
+					case 119032:return "璁惧SD鍗℃晠闅�";
+					case 119033:return "閲囬泦绾垮憡璀�";
 				}
 			}
 			return "閫氫俊鏁呴殰";

--
Gitblit v1.9.1