From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可

---
 src/main/java/org/springblade/modules/exam/entity/ExamPaper.java |   40 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java b/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
index 9391a7d..7754f7d 100644
--- a/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
+++ b/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
@@ -20,10 +20,10 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -52,7 +52,7 @@
 	private String examName;
 
 	/**
-	 * 考试类型
+	 * 考试类型  1 正式考试  2:模拟考试
 	 */
 	private Integer examType;
 
@@ -94,6 +94,8 @@
 	/**
 	 * 创建时间
 	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date creatorDate;
 
 	/**
@@ -101,5 +103,37 @@
 	 */
 	private String remark;
 
+	/**
+	 * 培训考试id
+	 */
+	@TableField("train_exam_id")
+	private Long trainExamId;
+
+	/**
+	 * 审核状态   1:通过   2:不通过  3:待审核
+	 */
+	@TableField("audit_status")
+	private Integer auditStatus;
+
+	/**
+	 * 审核明细
+	 */
+	@TableField("audit_detail")
+	private String auditDetail;
+
+	/**
+	 * 审核时间
+	 */
+	@TableField("audit_time")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date auditTime;
+
+	/**
+	 * 考场号id
+	 */
+	@TableField("exam_room_id")
+	private Integer examRoomId;
+
 
 }

--
Gitblit v1.9.3