Merge remote-tracking branch 'origin/master'

admin

2019-04-12 45f35a348c6d19f954888bf3e595bdf9d6016bb8

 fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java

@@ -340,6 +340,13 @@
            if (taoBaoGoodsBrief == null)

               continue; // 为空结束本次循环



				
            String auctionUrl = taoBaoGoodsBrief.getAuctionUrl();

            if (auctionUrl != null && auctionUrl.trim().length() > 0 && auctionUrl.contains("id=null")) {

               auctionUrl =auctionUrl.replace("id=null","id="+ taoBaoGoodsBrief.getAuctionId());

               taoBaoGoodsBrief.setAuctionUrl(auctionUrl);

            }

				
            Map<String, Object> map = new HashMap<String, Object>();

            

            BoutiqueAutoRule boutiqueAutoRule = selectionGoods.getBoutiqueAutoRule();