From 3f5f75f280b70a2d02f89aafbf22d8e5323e33f1 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期四, 27 九月 2018 15:02:42 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele-param.jsp | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/ele-param.jsp b/gx_tieta/WebRoot/ele-param.jsp
index e53414e..9250770 100644
--- a/gx_tieta/WebRoot/ele-param.jsp
+++ b/gx_tieta/WebRoot/ele-param.jsp
@@ -700,7 +700,8 @@
var json = JSON.stringify({
binf:{
StationName:$('#station_name').val(),
- StationName1:$('#station_name1').val(),
+ StationName2:$('#city').val(),
+ StationName1:$('#station_name1').val()
},
page:Page,
});
--
Gitblit v1.9.1