From 9ddc2aee31b9afc21659b378932a0f46f43071c2 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.24>
Date: 星期日, 30 九月 2018 11:50:57 +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 d1f260e..53bd8ce 100644
--- a/gx_tieta/WebRoot/equipHistWarn1.jsp
+++ b/gx_tieta/WebRoot/equipHistWarn1.jsp
@@ -678,6 +678,7 @@
 				case 618502:return "閫氳鍛婅";
 				case 618503:return "璁惧杩囨俯鍛婅";
 				case 618504:return "浜屾瀬绠1鍛婅";
+				case 119023:return "缁埅涓嶈冻鍛婅";
 			}
 		}
 		return "閫氫俊鏁呴殰";

--
Gitblit v1.9.1