From 4397fa6607ac892fa86c9d6e73dc9bbd94d0df7b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 14 五月 2020 18:39:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/order/ShareGoodsActivityOrder.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/ShareGoodsActivityOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/ShareGoodsActivityOrder.java
index 7197bff..1936178 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/ShareGoodsActivityOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/ShareGoodsActivityOrder.java
@@ -6,7 +6,6 @@
 import org.yeshi.utils.mybatis.Column;
 import org.yeshi.utils.mybatis.Table;
 
-import com.yeshi.fanli.entity.bus.user.Order;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 
 /**

--
Gitblit v1.8.0