From 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoodsGroup.java b/fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoodsGroup.java
index 4d0e259..5e26be4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoodsGroup.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoodsGroup.java
@@ -3,7 +3,7 @@
 import org.yeshi.utils.mybatis.Column;
 import org.yeshi.utils.mybatis.Table;
 
-import com.yeshi.fanli.goods.CommonGoods;
+import com.yeshi.fanli.entity.goods.CommonGoods;
 
 @Table("yeshi_ec_push_goods_group")
 public class PushGoodsGroup {

--
Gitblit v1.8.0