From 21a5d62894e6cca7d536ffcc1d63898ffaf16185 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 二月 2019 11:41:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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..64c8b5c 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
@@ -104,7 +104,7 @@
return;
}
- qualityFactoryService.addBatch(auctionIdList,lableNames, admin);
+ qualityFactoryService.addBatchGoodsByTaoBaoId(auctionIdList,lableNames, admin);
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛")));
@@ -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