From c02e430f16cb51cabb6f4b24f99ec48efc7b0596 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 11:59:20 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/batt-station-update.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-station-update.html b/gx_tieta/WebRoot/iframe/batt-station-update.html
index ed84629..ec524b6 100644
--- a/gx_tieta/WebRoot/iframe/batt-station-update.html
+++ b/gx_tieta/WebRoot/iframe/batt-station-update.html
@@ -45,8 +45,8 @@
<tbody>
{{# layui.each(d, function(index, item){ }}
<tr>
- <td>{{ item.FBSDeviceId }}</td>
- <td>{{ item.StationName }}</td>
+ <td>{{ item.fbsid }}</td>
+ <td>{{ item.stationname }}</td>
</tr>
{{# }); }}
</tbody>
--
Gitblit v1.9.1