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

admin

2019-11-13 221b5c8d0de3f6b17a00d543503a79c13b28ba12

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java

@@ -1,12 +1,8 @@
package com.yeshi.fanli.entity.bus.user;



import javax.persistence.Entity;

import javax.persistence.GeneratedValue;

import javax.persistence.GenerationType;

import javax.persistence.Id;

import javax.persistence.JoinColumn;

import javax.persistence.ManyToOne;

import javax.persistence.OneToOne;

import javax.persistence.Table;

import javax.persistence.Transient;