update

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamRegistration.java

@@ -1,5 +1,8 @@
 package com.keao.edu.user.entity;
 
+import com.keao.edu.auth.api.entity.SysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -7,46 +10,48 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
  */
 public class ExamRegistration {
 
-	/**  */
 	private Long id;
 	
-	/** 考试项目 */
+	@ApiModelProperty(value = "考级项目编号")
 	private Integer examinationBasicId;
 	
-	/** 学生 */
+	@ApiModelProperty(value = "学员编号")
 	private Integer studentId;
-	
-	/** 代理商 */
+
+	@ApiModelProperty(value = "学员基本信息")
+	private SysUser sysUser;
+
+	@ApiModelProperty(value = "代理商编号")
 	private Integer agencyId;
 	
-	/** 专业 */
+	@ApiModelProperty(value = "专业编号")
 	private Integer subjectId;
+
+	@ApiModelProperty(value = "专业信息")
+	private Subject subject;
 	
-	/** 级别 */
+	@ApiModelProperty(value = "报考级别")
 	private Integer level;
 	
-	/** 考试内容（json格式） */
+	@ApiModelProperty(value = "考试内容")
 	private String songJson;
 	
-	/** 上次考试级别 */
+	@ApiModelProperty(value = "上次报考级别")
 	private Integer lastExamLevel;
 	
-	/** 上次考试证书 */
+	@ApiModelProperty(value = "上次报考证书")
 	private String lastExamCertificateUrl;
 	
-	/** 指导老师姓名 */
+	@ApiModelProperty(value = "指导老师姓名")
 	private String adviserName;
 	
-	/** 指导老师电话 */
+	@ApiModelProperty(value = "指导老师电话")
 	private String adviserPhone;
-	
-	/**  */
+
 	private java.util.Date createTime;
-	
-	/**  */
+
 	private java.util.Date updateTime;
-	
-	/**  */
+
 	private String tenantId;
 	
 	public void setId(Long id){
@@ -56,7 +61,23 @@ public class ExamRegistration {
 	public Long getId(){
 		return this.id;
 	}
-			
+
+	public SysUser getSysUser() {
+		return sysUser;
+	}
+
+	public void setSysUser(SysUser sysUser) {
+		this.sysUser = sysUser;
+	}
+
+	public Subject getSubject() {
+		return subject;
+	}
+
+	public void setSubject(Subject subject) {
+		this.subject = subject;
+	}
+
 	public void setExaminationBasicId(Integer examinationBasicId){
 		this.examinationBasicId = examinationBasicId;
 	}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamRegistrationPayment.java

@@ -1,5 +1,6 @@
 package com.keao.edu.user.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -7,40 +8,36 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
  */
 public class ExamRegistrationPayment {
 
-	/**  */
 	private Long id;
 	
-	/**  */
+	@ApiModelProperty(value = "学员报考编号")
 	private Long examRegistrationId;
-	
-	/**  */
+
+	@ApiModelProperty(value = "学员编号")
 	private Integer studentId;
-	
-	/**  */
+
+	@ApiModelProperty(value = "报考项目编号")
 	private Integer examinationBasicId;
-	
-	/** 订单号（系统自动生成） */
+
+	@ApiModelProperty(value = "订单号（系统自动生成）")
 	private String orderNo;
-	
-	/** 交易流水号（由第三方返回） */
+
+	@ApiModelProperty(value = "交易流水号（由第三方返回）")
 	private String transNo;
-	
-	/** 交易金额 */
+
+	@ApiModelProperty(value = "交易金额")
 	private java.math.BigDecimal transAmount;
-	
-	/** 交易状态 */
+
+	@ApiModelProperty(value = "交易状态")
 	private String transStatus;
-	
-	/** 交易成功时间 */
+
+	@ApiModelProperty(value = "交易成功时间")
 	private java.util.Date transSuccessedTime;
-	
-	/**  */
+
 	private java.util.Date createTime;
-	
-	/**  */
+
 	private java.util.Date updateTime;
-	
-	/**  */
+
 	private String tenantId;
 	
 	public void setId(Long id){