From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java b/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java
index 7578cb4..2a134f2 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java
@@ -106,7 +106,7 @@
}
Stationtraffic st=new Stationtraffic();
st.setDev_id(rs.getInt("dev_id"));
- st.setNowflow(dayflow);
+ st.setDayflow(dayflow);
st.setStationName(rs.getString("stationName"));
st.setStationName1(rs.getString("stationName1"));
st.setStationName2(rs.getString("stationName2"));
@@ -122,7 +122,7 @@
if(rs.isLast()){
Stationtraffic st=new Stationtraffic();
st.setDev_id(rs.getInt("dev_id"));
- st.setNowflow(dayflow);
+ st.setDayflow(dayflow);
st.setStationName(rs.getString("stationName"));
st.setStationName1(rs.getString("stationName1"));
st.setStationName2(rs.getString("stationName2"));
--
Gitblit v1.9.1