From 3c22acc75a10799ccb4ce6ca0aba195ecfe29c15 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期一, 26 十一月 2018 18:39:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
index c122d4d..b5bfad7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -1772,6 +1772,7 @@
 		taoBaoGoods.setZkPrice(commonGoods.getPrice());
 		taoBaoGoods.setTkRate(commonGoods.getRate());
 		taoBaoGoods.setTkCommFee(new BigDecimal("0"));
+		taoBaoGoods.setState(commonGoods.getState());
 		return taoBaoGoods;
 	}
 

--
Gitblit v1.8.0