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

LiJun

2018-11-17 089ee1c06afa3d18c8313bea961594dad2b66e98

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

@@ -478,7 +478,6 @@
             for(int i=0;i<list.size();i++){

                Batttestdatastop sdata=list.get(i);

                sdata.setNote(binf.getBattProducer());

                sdata.setStationid(binf.getStationId());

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

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

                  if(sdata.getMon_num()==brinf.getOld_monum()&&sdata.getBattGroupId()==brinf.getOld_battgroupid()){