From 4e9b0e6b045536b1361946978ed49efcfeffb180 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 09 一月 2019 16:50:59 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html b/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html
index b08b71f..71cd293 100644
--- a/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html
+++ b/gx_tieta/WebRoot/mobil/wapprovalBatt-index.html
@@ -151,9 +151,10 @@
 						num :arrdata[i].num,
 						check_en:arrdata[i].check_en,
 						apply_date: arrdata[i].apply_date,
+						apply_name: arrdata[i].apply_name,
 						binf:{
 							StationId : arrdata[i].binf.StationId,	// 鏈烘埧缂栧彿
-							StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName5+"-"+arrdata[i].binf.StationName3),	// 鎷兼帴鏈烘埧鍚嶇О
+							StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName3+"-"+arrdata[i].binf.StationName4),	// 鎷兼帴鏈烘埧鍚嶇О
 							StationName1 :arrdata[i].binf.StationName1,		// 鐪�
 							StationName2 : arrdata[i].binf.StationName2,		// 甯�
 							StationName5 :  arrdata[i].binf.StationName5,		// 鍖�/鍘�

--
Gitblit v1.9.1