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

admin

2019-09-03 74ee9c42c1d87f3724a21e92871bc8c95c8364c6

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

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

   private Long id;



   public ThreeSale(Long id) {

      this.id = id;

   }

	
   public ThreeSale() {

   }



   @ManyToOne

   @JoinColumn(name = "boss_id")

   @Column(name = "boss_id")