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

admin

2019-09-20 db88b87df461820152d68d3d55a28f30c2da83e6

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

@@ -19,7 +19,6 @@
 *

 * @date 2018年1月29日

 */

@Entity

@Table(name = "yeshi_ec_threeSale")

@org.yeshi.utils.mybatis.Table("yeshi_ec_threeSale")

public class ThreeSale {

@@ -33,13 +32,18 @@
   @Column(name = "id")

   private Long id;



   @ManyToOne

   @JoinColumn(name = "boss_id")

   public ThreeSale(Long id) {

      this.id = id;

   }

	
   public ThreeSale() {

   }





   @Column(name = "boss_id")

   private UserInfo boss;// 邀请者



   @OneToOne

   @JoinColumn(name = "worker_id")



   @Column(name = "worker_id")

   private UserInfo worker; // 被邀请者