From a86aed1d459024ab2a97d98115ef57f8dce808e6 Mon Sep 17 00:00:00 2001
From: admin:huo123456@qq <496960745@qq.com>
Date: 星期一, 21 一月 2019 09:15:44 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/equipment.jsp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/equipment.jsp b/gx_tieta/WebRoot/equipment.jsp
index cd153cb..000e8ef 100644
--- a/gx_tieta/WebRoot/equipment.jsp
+++ b/gx_tieta/WebRoot/equipment.jsp
@@ -930,7 +930,7 @@
 					var _attr = {
 						StationId: __data.StationId
 					};
-					var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+					var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
 					optsList.push(tmp);
 				}
 				

--
Gitblit v1.9.1