Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-2/examcloud-rmi

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/OrgBean.java

@@ -23,6 +23,8 @@ public class OrgBean implements Serializable {
 
 	private Boolean enable;
 
+	private String code;
+
 	public Long getId() {
 		return id;
 	}
@@ -71,4 +73,12 @@ public class OrgBean implements Serializable {
 		this.enable = enable;
 	}
 
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
 }

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/request/SaveExamReq.java

@@ -1,48 +1,75 @@
 package cn.com.qmth.examcloud.examwork.api.request;
 
 import java.util.Date;
+import java.util.Map;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
 
 /**
- * @author  	chenken
- * @date    	2018年5月2日 下午3:44:54
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年5月2日 下午3:44:54
+ * @company QMTH
  * @description ExamReq.java
  */
 public class SaveExamReq extends BaseRequest {
 
 	private static final long serialVersionUID = -5832266903859887508L;
+
+	/**
+	 * ID
+	 */
+	private Long id;
+
 	/**
 	 * 机构ID
 	 */
 	private Long rootOrgId;
+
 	/**
 	 * 考试名称
 	 */
 	private String name;
+
 	/**
 	 * 考试类型
 	 */
 	private String examType;
+
 	/**
 	 * 考试开始时间
 	 */
 	private Date beginTime;
+
 	/**
 	 * 考试结束时间
 	 */
 	private Date endTime;
+
 	/**
 	 * 考试时长(分钟)
 	 */
 	private Integer duration;
+
 	/**
 	 * 备注
 	 */
 	private String remark;
 
-	
+	/**
+	 * 考试次数
+	 */
+	private Long examTimes;
+
+	private Map<String, String> properties;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
 	public Long getRootOrgId() {
 		return rootOrgId;
 	}
@@ -98,6 +125,21 @@ public class SaveExamReq extends BaseRequest {
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
-	
-}
 
+	public Long getExamTimes() {
+		return examTimes;
+	}
+
+	public void setExamTimes(Long examTimes) {
+		this.examTimes = examTimes;
+	}
+
+	public Map<String, String> getProperties() {
+		return properties;
+	}
+
+	public void setProperties(Map<String, String> properties) {
+		this.properties = properties;
+	}
+
+}