fanli-server.git

			@@ -1,6 +1,5 @@
			package com.yeshi.fanli.entity.bus.user;

			import java.math.BigDecimal;
			import java.util.Date;

			import org.springframework.data.annotation.Id;
			@@ -38,10 +37,10 @@
			private Boolean taobaoBind; // 绑定淘宝

			@Field
			private Boolean weixinBind; // 绑定微信
			private String weixinId; // 微信号

			@Field
			private String weixinId; // 微信号
			private Boolean weixinIdExist; // 填写微信号

			@Field
			private String phone; // 电话号码
			@@ -59,7 +58,7 @@
			private Integer fansNum; // 粉丝数量

			@Field
			private BigDecimal income; // 账户收入
			private Integer income; // 账户收入乘以100

			@Field
			private Date incomeTime; // 账户收入统计时间
			@@ -122,20 +121,12 @@
			this.nickName = nickName;
			}

			public String getMemoName() {
			return memoName;
			public UserLevelEnum getLevel() {
			return level;
			}

			public void setMemoName(String memoName) {
			this.memoName = memoName;
			}

			public String getTags() {
			return tags;
			}

			public void setTags(String tags) {
			this.tags = tags;
			public void setLevel(UserLevelEnum level) {
			this.level = level;
			}

			public Boolean getStateValid() {
			@@ -154,92 +145,20 @@
			this.taobaoBind = taobaoBind;
			}

			public Boolean getWeixinBind() {
			return weixinBind;
			}

			public void setWeixinBind(Boolean weixinBind) {
			this.weixinBind = weixinBind;
			}

			public Date getActiveTime() {
			return activeTime;
			}

			public void setActiveTime(Date activeTime) {
			this.activeTime = activeTime;
			}

			public Integer getFansNum() {
			return fansNum;
			}

			public void setFansNum(Integer fansNum) {
			this.fansNum = fansNum;
			}

			public BigDecimal getIncome() {
			return income;
			}

			public void setIncome(BigDecimal income) {
			this.income = income;
			}

			public Date getIncomeTime() {
			return incomeTime;
			}

			public void setIncomeTime(Date incomeTime) {
			this.incomeTime = incomeTime;
			}

			public Date getUpdateTime() {
			return updateTime;
			}

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

			public Date getJoinTime() {
			return joinTime;
			}

			public void setJoinTime(Date joinTime) {
			this.joinTime = joinTime;
			}

			public String getMemoNameSup() {
			return memoNameSup;
			}

			public void setMemoNameSup(String memoNameSup) {
			this.memoNameSup = memoNameSup;
			}

			public String getTagsSup() {
			return tagsSup;
			}

			public void setTagsSup(String tagsSup) {
			this.tagsSup = tagsSup;
			}

			public UserLevelEnum getLevel() {
			return level;
			}

			public void setLevel(UserLevelEnum level) {
			this.level = level;
			}

			public String getWeixinId() {
			return weixinId;
			}

			public void setWeixinId(String weixinId) {
			this.weixinId = weixinId;
			}

			public Boolean getWeixinIdExist() {
			return weixinIdExist;
			}

			public void setWeixinIdExist(Boolean weixinIdExist) {
			this.weixinIdExist = weixinIdExist;
			}

			public String getPhone() {
			@@ -266,4 +185,84 @@
			this.inviteCode = inviteCode;
			}

			public Date getActiveTime() {
			return activeTime;
			}

			public void setActiveTime(Date activeTime) {
			this.activeTime = activeTime;
			}

			public Integer getFansNum() {
			return fansNum;
			}

			public void setFansNum(Integer fansNum) {
			this.fansNum = fansNum;
			}

			public Integer getIncome() {
			return income;
			}

			public void setIncome(Integer income) {
			this.income = income;
			}

			public Date getIncomeTime() {
			return incomeTime;
			}

			public void setIncomeTime(Date incomeTime) {
			this.incomeTime = incomeTime;
			}

			public Date getJoinTime() {
			return joinTime;
			}

			public void setJoinTime(Date joinTime) {
			this.joinTime = joinTime;
			}

			public String getMemoName() {
			return memoName;
			}

			public void setMemoName(String memoName) {
			this.memoName = memoName;
			}

			public String getTags() {
			return tags;
			}

			public void setTags(String tags) {
			this.tags = tags;
			}

			public String getMemoNameSup() {
			return memoNameSup;
			}

			public void setMemoNameSup(String memoNameSup) {
			this.memoNameSup = memoNameSup;
			}

			public String getTagsSup() {
			return tagsSup;
			}

			public void setTagsSup(String tagsSup) {
			this.tagsSup = tagsSup;
			}

			public Date getUpdateTime() {
			return updateTime;
			}

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

			}