Merge branch 'div'

yujian

2019-01-29 c12c7cd45e9abb70c07be432b5c88754ae9120e3

 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);