From 1c66e0a1353b784bf94f34ea342bd39b052099a9 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.16>
Date: 星期三, 12 十二月 2018 08:56:19 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/equipHistWarn1.jsp | 1 +
gx_tieta/WebRoot/equipWarn1.jsp | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/WebRoot/equipHistWarn1.jsp b/gx_tieta/WebRoot/equipHistWarn1.jsp
index b17b982..e46a54e 100644
--- a/gx_tieta/WebRoot/equipHistWarn1.jsp
+++ b/gx_tieta/WebRoot/equipHistWarn1.jsp
@@ -764,6 +764,7 @@
case 119025:return "鍩虹珯鍙戠數鍛婅";
case 119026:return "鍩虹珯鎺夌珯鍛婅";
case 119027:return "鍩虹珯寮�闂ㄥ憡璀�";
+ case 119028:return "璁惧楂樻俯鍛婅";
}
}
return "閫氫俊鏁呴殰";
diff --git a/gx_tieta/WebRoot/equipWarn1.jsp b/gx_tieta/WebRoot/equipWarn1.jsp
index b7a2f09..2c56ccb 100644
--- a/gx_tieta/WebRoot/equipWarn1.jsp
+++ b/gx_tieta/WebRoot/equipWarn1.jsp
@@ -123,6 +123,7 @@
<option value="119025">鍩虹珯鍙戠數鍛婅</option>
<option value="119026">鍩虹珯鎺夌珯鍛婅</option>
<option value="119027">鍩虹珯寮�闂ㄥ憡璀�</option>
+ <option value ="119028">璁惧楂樻俯鍛婅</option>
</select>
</td>
@@ -738,6 +739,7 @@
case 119025:return "鍩虹珯鍙戠數鍛婅";
case 119026:return "鍩虹珯鎺夌珯鍛婅";
case 119027:return "鍩虹珯寮�闂ㄥ憡璀�";
+ case 119028:return "璁惧楂樻俯鍛婅";
}
}
return "閫氫俊鏁呴殰";
--
Gitblit v1.9.1