fanli-server.git

			@@ -1,5 +1,10 @@
			package com.yeshi.fanli.entity.bus.msg;

			import java.util.Date;

			import org.yeshi.utils.mybatis.Column;
			import org.yeshi.utils.mybatis.Table;

			import com.yeshi.fanli.entity.bus.user.UserInfo;

			/**
			@@ -8,12 +13,13 @@
			* @author Administrator
			*
			*/
			@Table("yeshi_ec_msg_account")
			public class MsgAccountDetail {
			public enum MsgTypeAccountEnumType {
			public enum MsgTypeAccountTypeEnum {
			bingding("账号绑定"), cancelBinding("取消绑定"), bingdingChange("绑定更换"), update("账号修改"), level("账号等级"), connect("账号合并");
			private final String desc;

			private MsgTypeAccountEnumType(String desc) {
			private MsgTypeAccountTypeEnum(String desc) {
			this.desc = desc;
			}

			@@ -22,11 +28,56 @@
			}
			}

			@Column(name = "ma_id")
			private Long id;
			@Column(name = "ma_uid")
			private UserInfo user;
			private MsgTypeAccountEnumType type;// 类型
			@Column(name = "ma_type")
			private MsgTypeAccountTypeEnum type;// 类型
			@Column(name = "ma_title")
			private String title;// 事项
			@Column(name = "ma_content")
			private String content;// 状态
			@Column(name = "ma_beizhu")
			private String beiZhu;// 备注
			@Column(name = "ma_read")
			private Boolean read;
			@Column(name = "ma_create_time")
			private Date createTime;
			@Column(name = "ma_update_time")
			private Date updateTime;

			public Long getId() {
			return id;
			}

			public void setId(Long id) {
			this.id = id;
			}

			public Boolean getRead() {
			return read;
			}

			public void setRead(Boolean read) {
			this.read = read;
			}

			public Date getCreateTime() {
			return createTime;
			}

			public void setCreateTime(Date createTime) {
			this.createTime = createTime;
			}

			public Date getUpdateTime() {
			return updateTime;
			}

			public void setUpdateTime(Date updateTime) {
			this.updateTime = updateTime;
			}

			public UserInfo getUser() {
			return user;
			@@ -52,11 +103,11 @@
			this.content = content;
			}

			public MsgTypeAccountEnumType getType() {
			public MsgTypeAccountTypeEnum getType() {
			return type;
			}

			public void setType(MsgTypeAccountEnumType type) {
			public void setType(MsgTypeAccountTypeEnum type) {
			this.type = type;
			}