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