Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-19 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd

 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java

@@ -4719,7 +4719,7 @@
      BattInf binf = new BattInf();

      binf.setNum(0);

      binf.setBattGroupId(1000001);

      binf.setStationName("42000017");

      binf.setStationName("42000611");

      binf.setStationName1("");

      binf.setStationName2("");

      binf.setStationName3("");