From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsGroupService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsGroupService.java
index b821da0..ab6d5bd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsGroupService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsGroupService.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 
+import com.yeshi.fanli.dto.HongBao;
 import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
-import com.yeshi.fanli.entity.bus.user.HongBao;
 import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
 
 public interface UserShareGoodsGroupService {

--
Gitblit v1.8.0