From ee26d58531067afff8e036efa93cb0d57a773250 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 05 十二月 2018 16:19:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/CollectionGoodsV2Factory.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/CollectionGoodsV2Factory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/CollectionGoodsV2Factory.java
index 763efd3..a36422f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/CollectionGoodsV2Factory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/CollectionGoodsV2Factory.java
@@ -3,9 +3,9 @@
 import java.util.Date;
 
 import com.yeshi.fanli.entity.bus.user.CollectionGoods;
+import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
+import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.goods.CollectionGoodsV2;
-import com.yeshi.fanli.goods.CommonGoods;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 
 public class CollectionGoodsV2Factory {

--
Gitblit v1.8.0