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

admin

2020-05-26 8d83c7c3595c1869cd4f406fb106ce59a2fb99ce

 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;



/**