Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-18 864e4772eea5e0a589b6f6797d0695a3b3dd225e

 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"));