Merge remote-tracking branch 'origin/div' into div

yujian

2020-05-14 4397fa6607ac892fa86c9d6e73dc9bbd94d0df7b

 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;



/**