Merge remote-tracking branch 'origin/master'

admin

2019-03-13 f1fdf1aec9fb9f8f4d1220d4c8b3489b648ab59b

 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserMsgUnReadNum.java

@@ -35,6 +35,10 @@
   @Expose

   @Column(name = "mrs_type_system")

   private Integer typeSystem;// 系统消息未读数

   @Expose

   @Column(name = "mrs_type_other")

   private Integer typeOther;// 其他消息



   @Column(name = "mrs_create_time")

   private Date createTime;

   @Column(name = "mrs_update_time")

@@ -104,6 +108,14 @@
      this.user = user;

   }



   public Integer getTypeOther() {

      return typeOther;

   }



   public void setTypeOther(Integer typeOther) {

      this.typeOther = typeOther;

   }



   public Date getCreateTime() {

      return createTime;

   }