添加了APPversion

.gitignore

@@ -10,3 +10,4 @@
 out
 gen
 /bin/
+.classpath

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

+/**
+ * 
+ */
+package com.senthink.rmi.challenger.vo;
+
+import java.util.Date;
+
+/**
+ * @ClassName : EllaAppVersionVo
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年2月10日下午2:57:07
+ */
+public class EllaAppVersionVo extends PageVo {
+	private Integer id;
+
+	/** 版本号 */
+	private String versionCode;
+
+	/** android的更新地址 */
+	private String url;
+
+	/** 版本时间 */
+	private Date date;
+
+	/** 操作系统 */
+	private String operation;
+
+	/**  */
+	private String versionName;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getVersionCode() {
+		return versionCode;
+	}
+
+	public void setVersionCode(String versionCode) {
+		this.versionCode = versionCode;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+
+	public String getOperation() {
+		return operation;
+	}
+
+	public void setOperation(String operation) {
+		this.operation = operation;
+	}
+
+	public String getVersionName() {
+		return versionName;
+	}
+
+	public void setVersionName(String versionName) {
+		this.versionName = versionName;
+	}
+
+}

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

 package com.senthink.rmi.challenger.vo;
 
-import org.hibernate.validator.constraints.NotEmpty;
-
 import java.io.Serializable;
 
 public class EllaOrgStructureVo implements Serializable {
 
 	private static final long serialVersionUID = -5620497436811285836L;
 	private Integer id;
-/**
+	/**
 	 * 组织结构名称
 	 */
-    @NotEmpty(message = "组织架构名不允许为空")
 	private String name;
-/**
+	/**
 	 * 上级架构的id
 	 */
 	private Integer parentId;
-/**
+	/**
 	 * 组织架构的层级 0最高层级 向下递增
 	 */
 	private Integer level;
-/**
+	/**
 	 * 编号
 	 */
 	private String number;
-/**
+	/**
 	 * 英文缩写
 	 */
 	private String abbreviation;
-/**
+	/**
 	 * 简称
 	 */
 	private String shortName;
@@ -39,6 +36,8 @@ public class EllaOrgStructureVo implements Serializable {
 	 */
 	private String enName;
 
+	public interface SEARCH {
+	};
 
 	public Integer getId() {
 		return id;
@@ -51,47 +50,55 @@ public class EllaOrgStructureVo implements Serializable {
 	public String getName() {
 		return this.name;
 	}
-    public void setName (String name) {
+
+	public void setName(String name) {
 		this.name = name;
 	}
 
-    public Integer getParentId () {
+	public Integer getParentId() {
 		return this.parentId;
 	}
-    public void setParentId (Integer parentId) {
+
+	public void setParentId(Integer parentId) {
 		this.parentId = parentId;
 	}
 
-    public Integer getLevel () {
+	public Integer getLevel() {
 		return this.level;
 	}
-    public void setLevel (Integer level) {
+
+	public void setLevel(Integer level) {
 		this.level = level;
 	}
 
-    public String getNumber () {
+	public String getNumber() {
 		return this.number;
 	}
-    public void setNumber (String number) {
+
+	public void setNumber(String number) {
 		this.number = number;
 	}
 
-    public String getAbbreviation () {
+	public String getAbbreviation() {
 		return this.abbreviation;
 	}
-    public void setAbbreviation (String abbreviation) {
+
+	public void setAbbreviation(String abbreviation) {
 		this.abbreviation = abbreviation;
 	}
 
-    public String getShortName () {
+	public String getShortName() {
 		return this.shortName;
 	}
-    public void setShortName (String shortName) {
+
+	public void setShortName(String shortName) {
 		this.shortName = shortName;
 	}
+
 	public String getEnName() {
 		return enName;
 	}
+
 	public void setEnName(String enName) {
 		this.enName = enName;
 	}

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

 package com.senthink.rmi.challenger.vo;
 
-import org.hibernate.validator.constraints.NotEmpty;
-
-import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 import java.util.Date;
 
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.NotEmpty;
+import org.springframework.web.multipart.MultipartFile;
+
 public class EllaUserBaseVo implements Serializable {
 
 	private static final long serialVersionUID = -3641762319070709334L;
@@ -15,12 +17,12 @@ public class EllaUserBaseVo implements Serializable {
 	private static final String phoneReg = "^(13|15|18|17)\\d{9}$";
 
 	private Integer id;
-/**
+	/**
 	 * 登录名
 	 */
 	@NotEmpty(message = "{error_ue_loginname_null}")
 	private String loginName;
-/**
+	/**
 	 * 密码
 	 */
 	private String password;
@@ -30,33 +32,33 @@ public class EllaUserBaseVo implements Serializable {
 	 */
 	@NotEmpty(message = "真实姓名不能为空")
 	private String realName;
-/**
+	/**
 	 * 手机号
 	 */
-    @Pattern(regexp = phoneReg, message="手机格式不正确")
+	@Pattern(regexp = phoneReg, message = "手机格式不正确")
 	private String telephone;
-/**
+	/**
 	 * 邮箱
 	 */
-	@Pattern(regexp = emailReg, message="邮箱格式不正确")
+	@Pattern(regexp = emailReg, message = "邮箱格式不正确")
 	private String email;
-/**
+	/**
 	 * 地址
 	 */
 	private String address;
-/**
+	/**
 	 * 注册日期
 	 */
 	private Date regTime;
-/**
+	/**
 	 * 截止日期
 	 */
 	private String endTime;
-/**
+	/**
 	 * 用户类型id
 	 */
 	private Integer userTypeId;
-/**
+	/**
 	 * 用户状态 0 启用/ 1 禁用
 	 */
 	private Integer state;
@@ -95,6 +97,64 @@ public class EllaUserBaseVo implements Serializable {
 	private String gpsValue;
 	private String isUpdatePic;
 
+	private String roles;
+
+	private String orgid;
+
+	private String[] extendsValue;
+
+	private String orgs;
+
+	private MultipartFile file;
+
+	public String getOrgs() {
+		return orgs;
+	}
+
+	public void setOrgs(String orgs) {
+		this.orgs = orgs;
+	}
+
+	public MultipartFile getFile() {
+		return file;
+	}
+
+	public void setFile(MultipartFile file) {
+		this.file = file;
+	}
+
+	public String getRoles() {
+		return roles;
+	}
+
+	public void setRoles(String roles) {
+		this.roles = roles;
+	}
+
+	public String getOrgid() {
+		return orgid;
+	}
+
+	public void setOrgid(String orgid) {
+		this.orgid = orgid;
+	}
+
+	public String[] getExtendsValue() {
+		return extendsValue;
+	}
+
+	public void setExtendsValue(String[] extendsValue) {
+		this.extendsValue = extendsValue;
+	}
+
+	public static String getEmailreg() {
+		return emailReg;
+	}
+
+	public static String getPhonereg() {
+		return phoneReg;
+	}
+
 	public Integer getId() {
 		return id;
 	}
@@ -106,138 +166,175 @@ public class EllaUserBaseVo implements Serializable {
 	public String getIsUpdatePic() {
 		return isUpdatePic;
 	}
+
 	public void setIsUpdatePic(String isUpdatePic) {
 		this.isUpdatePic = isUpdatePic;
 	}
+
 	public String getGpsValue() {
 		return gpsValue;
 	}
+
 	public void setGpsValue(String gpsValue) {
 		this.gpsValue = gpsValue;
 	}
+
 	public String getTradeBgnTime() {
 		return tradeBgnTime;
 	}
+
 	public void setTradeBgnTime(String tradeBgnTime) {
 		this.tradeBgnTime = tradeBgnTime;
 	}
+
 	public String getTradeEndTime() {
 		return tradeEndTime;
 	}
+
 	public void setTradeEndTime(String tradeEndTime) {
 		this.tradeEndTime = tradeEndTime;
 	}
+
 	public String getPicIds() {
 		return picIds;
 	}
+
 	public void setPicIds(String picIds) {
 		this.picIds = picIds;
 	}
+
 	public String getPicUrls() {
 		return picUrls;
 	}
+
 	public void setPicUrls(String picUrls) {
 		this.picUrls = picUrls;
 	}
+
 	public Integer getParentId() {
 		return parentId;
 	}
+
 	public void setParentId(Integer parentId) {
 		this.parentId = parentId;
 	}
-	public String getLoginName () {
+
+	public String getLoginName() {
 		return this.loginName;
 	}
-    public void setLoginName (String loginName) {
+
+	public void setLoginName(String loginName) {
 		this.loginName = loginName;
 	}
 
-    public String getPassword () {
+	public String getPassword() {
 		return this.password;
 	}
-    public void setPassword (String password) {
+
+	public void setPassword(String password) {
 		this.password = password;
 	}
 
-    public String getTelephone () {
+	public String getTelephone() {
 		return this.telephone;
 	}
-    public void setTelephone (String telephone) {
+
+	public void setTelephone(String telephone) {
 		this.telephone = telephone;
 	}
 
-    public String getEmail () {
+	public String getEmail() {
 		return this.email;
 	}
-    public void setEmail (String email) {
+
+	public void setEmail(String email) {
 		this.email = email;
 	}
 
-    public String getAddress () {
+	public String getAddress() {
 		return this.address;
 	}
-    public void setAddress (String address) {
+
+	public void setAddress(String address) {
 		this.address = address;
 	}
 
 	public Date getRegTime() {
 		return regTime;
 	}
+
 	public void setRegTime(Date regTime) {
 		this.regTime = regTime;
 	}
+
 	public String getEndTime() {
 		return endTime;
 	}
+
 	public void setEndTime(String endTime) {
 		this.endTime = endTime;
 	}
-	public Integer getUserTypeId () {
+
+	public Integer getUserTypeId() {
 		return this.userTypeId;
 	}
-    public void setUserTypeId (Integer userTypeId) {
+
+	public void setUserTypeId(Integer userTypeId) {
 		this.userTypeId = userTypeId;
 	}
 
 	public Integer getState() {
 		return state;
 	}
+
 	public void setState(Integer state) {
 		this.state = state;
 	}
+
 	public String getPhoneName() {
 		return phoneName;
 	}
+
 	public void setPhoneName(String phoneName) {
 		this.phoneName = phoneName;
 	}
+
 	public String getPhoneUuid() {
 		return phoneUuid;
 	}
+
 	public void setPhoneUuid(String phoneUuid) {
 		this.phoneUuid = phoneUuid;
 	}
+
 	public String getRealName() {
 		return realName;
 	}
+
 	public void setRealName(String realName) {
 		this.realName = realName;
 	}
+
 	public String getClientId() {
 		return clientId;
 	}
+
 	public void setClientId(String clientId) {
 		this.clientId = clientId;
 	}
+
 	public String getClientType() {
 		return clientType;
 	}
+
 	public void setClientType(String clientType) {
 		this.clientType = clientType;
 	}
+
 	public String getVirifyCode() {
 		return virifyCode;
 	}
+
 	public void setVirifyCode(String virifyCode) {
 		this.virifyCode = virifyCode;
 	}

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

+package com.senthink.rmi.challenger.vo;
+
+/**
+ * The type Page param.
+ *
+ * @Project : Columbia
+ * @Package Name : com.senthink.www.domain.param
+ * @Class Name : ${CLASS_NAME}
+ * @Description :
+ * @Author : lingcy@lierda.com
+ * @Creation Date : 2016年11月23日 上午11:29
+ * @ModificationHistory Who When What -------- ----------
+ *                      -----------------------------------
+ */
+public class PageVo {
+
+	private int current = 1;
+
+	private int size = 10;
+
+	private String search;
+
+	private String searchBgnTime;
+
+	private String searchEndTime;
+
+	private String sort;
+
+	/**
+	 * Gets search end time.
+	 *
+	 * @return the search end time
+	 */
+	public String getSearchEndTime() {
+		return searchEndTime;
+	}
+
+	/**
+	 * Sets search end time.
+	 *
+	 * @param searchEndTime
+	 *            the search end time
+	 */
+	public void setSearchEndTime(String searchEndTime) {
+		this.searchEndTime = searchEndTime;
+	}
+
+	public int getCurrent() {
+		return current;
+	}
+
+	public void setCurrent(int current) {
+		this.current = current;
+	}
+
+	public int getSize() {
+		return size;
+	}
+
+	public void setSize(int size) {
+		this.size = size;
+	}
+
+	public String getSearch() {
+		return search;
+	}
+
+	public void setSearch(String search) {
+		this.search = search;
+	}
+
+	public String getSearchBgnTime() {
+		return searchBgnTime;
+	}
+
+	public void setSearchBgnTime(String searchBgnTime) {
+		this.searchBgnTime = searchBgnTime;
+	}
+
+	public String getSort() {
+		return sort;
+	}
+
+	public void setSort(String sort) {
+		this.sort = sort;
+	}
+
+}