From 5b79cca40ac53a5d92c3065f4f0164688e86a770 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.11>
Date: 星期一, 26 十一月 2018 15:26:16 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/charge-test.jsp |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 0c280ba..ef37230 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -64,6 +64,9 @@
 		z-index: 99;
 		background-color: #FFFFFF;
 	}
+	.myconfirm {
+		z-index: 999998
+	}
 </style>
 </head>
 
@@ -484,6 +487,10 @@
 					<td><s:text name="Head"/></td>									<!-- 璐熻矗浜� -->
 					<td></td>
 				</tr>
+				<tr>
+					<td>瀹夎浜哄憳</td>									<!-- 璐熻矗浜� -->
+					<td id="installUser"></td>
+				</tr>
 			</table>
 		</div>
 		<div class="con-list ele-infor" style="height: 400px;overflow-y: auto">

--
Gitblit v1.9.1