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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -17,37 +17,50 @@
@Table("yeshi_ec_msg_invite")

public class MsgInviteDetail {

   public enum MsgTypeInviteTypeEnum {

      invite("邀请消息"), exchangeCode("恭喜你，邀请码兑换成功");

      invite("邀请消息","http://img.flqapp.com/resource/msg/icon_msg_invite.png"),

      exchangeCode("恭喜你，邀请码兑换成功","http://img.flqapp.com/resource/msg/icon_msg_invite.png"),

      receiveGift("领取礼品","http://img.flqapp.com/resource/msg/icon_msg_invite.png"),

      fansUpgrade("粉丝升级","http://img.flqapp.com/resource/msg/icon_msg_team_level.png"),

      fansDivorced("脱离提醒","http://img.flqapp.com/resource/msg/icon_msg_team_separate.png"),

      inviteSucceed("邀请提醒","http://img.flqapp.com/resource/msg/icon_msg_invite.png");

		
      private final String desc;



      private MsgTypeInviteTypeEnum(String desc) {

      private final String icon;

		
      private MsgTypeInviteTypeEnum(String desc, String icon) {

         this.desc = desc;

         this.icon = icon;

      }



      public String getDesc() {

         return desc;

      }

		
      public String getIcon() {

         return icon;

      }

   }



   @Column(name="mi_id")

   @Column(name = "mi_id")

   private Long id;

   @Column(name="mi_uid")

   @Column(name = "mi_uid")

   private UserInfo user;

   @Column(name="mi_type")

   @Column(name = "mi_type")

   private MsgTypeInviteTypeEnum msgType;// 消息类型

   @Column(name="mi_invite_id")

   @Column(name = "mi_invite_id")

   private ThreeSale inviteUser;// 邀请信息

   @Column(name="mi_desc")

   @Column(name = "mi_desc")

   private String desc;// 说明

   @Column(name="mi_beizhu")

   @Column(name = "mi_beizhu")

   private String beiZhu;// 备注

   @Column(name="mi_read")

   @Column(name = "mi_read")

   private Boolean read;// 是否已读

   @Column(name="mi_create_time")

   @Column(name = "mi_create_time")

   private Date createTime;

   @Column(name="mi_update_time")

   @Column(name = "mi_update_time")

   private Date updateTime;

   

   private String extraInfo;// 新版消息内容



   public Long getId() {

      return id;

@@ -121,4 +134,12 @@
      this.updateTime = updateTime;

   }



   public String getExtraInfo() {

      return extraInfo;

   }



   public void setExtraInfo(String extraInfo) {

      this.extraInfo = extraInfo;

   }



}