Merge branch 'master' of git-server.lierdapark.com:JasonGroup/challenger-rmi

src/main/java/com/senthink/rmi/challenger/vo/EllaUserExtendsValueHistoryVo.java

+package com.senthink.rmi.challenger.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class EllaUserExtendsValueHistoryVo extends PageVo {
+
+	@ApiModelProperty("用户id")
+	private Integer userId;
+	/**
+	 * 历史扩展属性ID
+	 */
+	@ApiModelProperty("历史扩展属性ID")
+	private Integer extendsId;
+	/**
+	 * 历史扩展属性值
+	 */
+	@ApiModelProperty("历史扩展属性值")
+	private String extendsValue;
+
+	public Integer getUserId() {
+		return this.userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public Integer getExtendsId() {
+		return this.extendsId;
+	}
+
+	public void setExtendsId(Integer extendsId) {
+		this.extendsId = extendsId;
+	}
+
+	public String getExtendsValue() {
+		return this.extendsValue;
+	}
+
+	public void setExtendsValue(String extendsValue) {
+		this.extendsValue = extendsValue;
+	}
+
+}

src/main/java/com/senthink/rmi/challenger/vo/EllaUserExtendsValueNewVo.java

+package com.senthink.rmi.challenger.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class EllaUserExtendsValueNewVo extends PageVo {
+
+	/**
+	 * 用户ID
+	 */
+	@ApiModelProperty("用户ID")
+	private Integer userId;
+	/**
+	 * 修改后的扩展属性ID
+	 */
+	@ApiModelProperty("修改后的扩展属性ID")
+	private Integer extendsId;
+	/**
+	 * 修改后的扩展属性值
+	 */
+	@ApiModelProperty("修改后的扩展属性值")
+	private String extendsValue;
+
+	public Integer getUserId() {
+		return this.userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public Integer getExtendsId() {
+		return this.extendsId;
+	}
+
+	public void setExtendsId(Integer extendsId) {
+		this.extendsId = extendsId;
+	}
+
+	public String getExtendsValue() {
+		return this.extendsValue;
+	}
+
+	public void setExtendsValue(String extendsValue) {
+		this.extendsValue = extendsValue;
+	}
+
+}