Merge remote-tracking branch 'origin/master'

admin

2018-12-22 f066298a11b302e6b19c7b5f589ccc3102dccf46

 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityFactoryServiceImpl.java

@@ -253,11 +253,7 @@
         }

      }



      List<String> strList = new ArrayList<String>();

      for (Long id : auctionIdList) {

         strList.add(id + "");

      }

      List<TaoBaoGoodsBrief> existList = taoBaoGoodsBriefRecordMapper.queryGoodsByAuctionId(strList);

      List<TaoBaoGoodsBrief> existList = taoBaoGoodsBriefRecordMapper.queryByAuctionIdList(auctionIdList);



      List<QualityFactory> addList = new ArrayList<QualityFactory>();

      List<LabelGoods> addLabelList = new ArrayList<LabelGoods>();