From d1bf4588a39bcba69fd39f3cc3b3a6c439e25cb6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 19 十二月 2018 17:28:19 +0800
Subject: [PATCH] Merge branch 'master' into dev-moneydetail

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
index fc0ede5..c63fe75 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
@@ -10,12 +10,12 @@
 import org.springframework.stereotype.Service;
 
 import com.yeshi.fanli.dao.mybatis.push.PushGoodsMapper;
+import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.fanli.entity.push.PushGoods;
 import com.yeshi.fanli.entity.push.PushGoodsGroup;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.exception.PushException;
 import com.yeshi.fanli.exception.push.PushGoodsException;
-import com.yeshi.fanli.goods.CommonGoods;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
 import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;

--
Gitblit v1.8.0