Merge remote-tracking branch 'origin/master'

admin

2019-07-09 b5624f9e80d4fa8d9bb42f759b47f8059ba6a0eb

 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")