From b3f62ab5fb6adf03a92f62b42e69ad849f903b45 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 28 十二月 2018 17:08:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/equipHistWarn1.jsp |    1 +
 1 files changed, 1 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 "閫氫俊鏁呴殰";

--
Gitblit v1.9.1