From 951777654234cf9c03aa33e195eda05c1ec32c34 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.24>
Date: 星期三, 14 十一月 2018 13:42:30 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 5c22148..15e221f 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -3923,6 +3923,7 @@
 						  BattInf batt = new BattInf();
 						  
 						  batt.setStationId((rs.getString("StationId")));
+						  batt.setStationId_ex(rs.getString("stationId_ex"));
 						  
 						  batt.setStationName(rs.getString("StationName"));
 						  

--
Gitblit v1.9.1