From 075f6eceec6908178ba53b40b7794e2f90f74c92 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 09 一月 2019 17:40:10 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CollectionGoodsV2Service.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CollectionGoodsV2Service.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CollectionGoodsV2Service.java
index f41c991..d4db001 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CollectionGoodsV2Service.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CollectionGoodsV2Service.java
@@ -2,9 +2,9 @@
 
 import java.util.List;
 
+import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.exception.goods.CollectionGoodsException;
-import com.yeshi.fanli.goods.CollectionGoodsV2;
 
 public interface CollectionGoodsV2Service {
 

--
Gitblit v1.8.0