From a6b1160da8cbb78a664a6dd7496bee648c7c148c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 29 一月 2019 17:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java
index 35250c2..cd74b54 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java
+++ b/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);
 			

--
Gitblit v1.8.0