From d839edf15d110f25cb05b76c10b861d96996e1ee Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 19 十一月 2018 16:41:04 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/mobil/machineroomM.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/machineroomM.html b/gx_tieta/WebRoot/mobil/machineroomM.html
index c771bae..d4602ea 100644
--- a/gx_tieta/WebRoot/mobil/machineroomM.html
+++ b/gx_tieta/WebRoot/mobil/machineroomM.html
@@ -124,7 +124,7 @@
 			for (var i = 0; i < dataList.length; i++){
 				var _li = $('<li></li');
 				
-				var _a = $('<a href="#page1" value=""  data-transition="slide">'+dataList[i].StationName+'</a>');
+				var _a = $('<a href="#page1" value=""  data-transition="slide">'+dataList[i].StationName1+'</a>');
 								
 				// 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
 				_li.append(_a);

--
Gitblit v1.9.1