Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -53,6 +53,10 @@
   @Column(name = "uie_coupon_news")

   private Integer couponNews;



   // 是否同步导航栏

   @Column(name = "uie_synch_navbar")

   private Boolean synchNavbar;

	
   // 首次登录时间

   @Column(name = "uie_first_login_time")

   private Date firstLoginTime;

@@ -161,4 +165,13 @@
   public void setFirstLoginTime(Date firstLoginTime) {

      this.firstLoginTime = firstLoginTime;

   }



   public Boolean getSynchNavbar() {

      return synchNavbar;

   }



   public void setSynchNavbar(Boolean synchNavbar) {

      this.synchNavbar = synchNavbar;

   }

	
}