From 864e4772eea5e0a589b6f6797d0695a3b3dd225e Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:19:31 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@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