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

yujian

2020-05-13 3b9e1385a90ae84f97f2a4b8b7a35a6b13c01062

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/invite/TeamDailyRecord.java

@@ -50,7 +50,7 @@
   @Field

   private Integer beyondSuperVIP;

   @Field

   private String updateTime;

   private Date updateTime;

   



   public TeamDailyRecord() {}

@@ -190,11 +190,11 @@
      this.beyondSuperVIP = beyondSuperVIP;

   }



   public String getUpdateTime() {

   public Date getUpdateTime() {

      return updateTime;

   }



   public void setUpdateTime(String updateTime) {

   public void setUpdateTime(Date updateTime) {

      this.updateTime = updateTime;

   }