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

81041

2018-12-11 c119b9dd98241cc623296840e28487e4c5aa6928

 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()){