merge

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

@@ -164,6 +164,106 @@ public class EllaUserBaseVo extends PageVo {
 
 	private String vcuNo;
 
+	private String start;
+
+	private String end;
+
+	private String auditBgnTime;
+
+	private String auditEndTime;
+
+	private String totalDealer;
+
+	private String url;
+
+	private String type;
+
+	private String level;
+
+	private String subsystemId;
+
+	private String isMenu;
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getLevel() {
+		return level;
+	}
+
+	public void setLevel(String level) {
+		this.level = level;
+	}
+
+	public String getSubsystemId() {
+		return subsystemId;
+	}
+
+	public void setSubsystemId(String subsystemId) {
+		this.subsystemId = subsystemId;
+	}
+
+	public String getIsMenu() {
+		return isMenu;
+	}
+
+	public void setIsMenu(String isMenu) {
+		this.isMenu = isMenu;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getTotalDealer() {
+		return totalDealer;
+	}
+
+	public void setTotalDealer(String totalDealer) {
+		this.totalDealer = totalDealer;
+	}
+
+	public String getAuditBgnTime() {
+		return auditBgnTime;
+	}
+
+	public void setAuditBgnTime(String auditBgnTime) {
+		this.auditBgnTime = auditBgnTime;
+	}
+
+	public String getAuditEndTime() {
+		return auditEndTime;
+	}
+
+	public void setAuditEndTime(String auditEndTime) {
+		this.auditEndTime = auditEndTime;
+	}
+
+	public String getStart() {
+		return start;
+	}
+
+	public void setStart(String start) {
+		this.start = start;
+	}
+
+	public String getEnd() {
+		return end;
+	}
+
+	public void setEnd(String end) {
+		this.end = end;
+	}
+
 	public String getVcuNo() {
 		return vcuNo;
 	}

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

@@ -38,6 +38,28 @@ public class EllaUserExtendsVo extends PageVo {
 	@ApiModelProperty("单选框或复选框的待选值,用,隔开")
 	private String content;
 	
+	@ApiModelProperty("登录名")
+	private String loginName;
+	
+	@ApiModelProperty("扩展属性值")
+	private String attributeValue;
+	
+	public String getLoginName() {
+		return loginName;
+	}
+
+	public void setLoginName(String loginName) {
+		this.loginName = loginName;
+	}
+
+	public String getAttributeValue() {
+		return attributeValue;
+	}
+
+	public void setAttributeValue(String attributeValue) {
+		this.attributeValue = attributeValue;
+	}
+
 	public Integer getUserTypeId() {
 		return userTypeId;
 	}