From 9ba77f85d56a4a52d5a7b57c9747dd96ee6f1ba6 Mon Sep 17 00:00:00 2001
From: 军 <军@hp-pc>
Date: 星期六, 29 九月 2018 19:01:14 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@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