Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

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