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

81041

2018-10-11 5de347e1a4dc3b32b230e092cd12cac9af75bda0

 gx_tieta/src/com/fgkj/services/BattInfServices.java

@@ -830,6 +830,7 @@
                   Batttestdatastop sdata=new Batttestdatastop();

                   sdata.setBattGroupId(binf.getBattGroupId());

                   sdata.setNote(binf.getBattProducer());

                   sdata.setStationid(binf.getStationId());

                   sdata.setMon_num(j+1);

                   for (int z = 0; z < listr.size(); z++) {

                      BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(z);