Merge remote-tracking branch 'origin/master'

admin

2019-01-29 2d634416cc026d139d515d53b6fa56f73d253458

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

@@ -919,6 +919,9 @@
         if (!StringUtil.isNullOrEmpty(pictUrl)) 

            taobao.setPictUrl(pictUrl);

         

         if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite())) 
            taobao.setPictUrlWhite(tb.getPictUrlWhite());

			
         // 更新商品

         taoBaoGoodsUpdateService.getUpdateTaoBaoGoodsBrief(taobao);