From 97db75238a96a75f41bafd469548c2a84ba37080 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期五, 28 九月 2018 14:31:04 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/WebRoot/equip-charge-param.jsp b/gx_tieta/WebRoot/equip-charge-param.jsp
index 28bbe8a..a2192f4 100644
--- a/gx_tieta/WebRoot/equip-charge-param.jsp
+++ b/gx_tieta/WebRoot/equip-charge-param.jsp
@@ -444,7 +444,7 @@
 						var __data = _data[i];
 						var _attr = {
 							'stataion_name1': __data.StationName1,
-							'stataion_name': __data.StationName3,
+							'stataion_name': __data.StationName,
 							'dev_name': __data.FBSDeviceName
 						};
 						var tmp = getOptionsData(__data.StationName3, __data.FBSDeviceId, __data, _attr);

--
Gitblit v1.9.1