From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/domain/entity/Exam.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/Exam.java b/src/main/java/com/ycl/jxkg/domain/entity/Exam.java
index c5f9cbb..eadd953 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/Exam.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Exam.java
@@ -1,10 +1,13 @@
package com.ycl.jxkg.domain.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
import com.ycl.jxkg.domain.base.AbsEntity;
+import com.ycl.jxkg.enums.general.ExamStatusEnum;
import lombok.Data;
/**
@@ -33,7 +36,7 @@
@TableField("exam_paper_type")
/** 璇曞嵎绫诲瀷 */
- private String examPaperType;
+ private Integer examPaperType;
@TableField("exam_place")
/** 鑰冭瘯鍦扮偣 */
@@ -41,19 +44,23 @@
@TableField("status")
/** 鑰冭瘯鐘舵�� */
- private String status;
+ private ExamStatusEnum status;
@TableField("start_time")
/** 寮�濮嬫椂闂� */
- private LocalDateTime startTime;
+ private Date startTime;
@TableField("end_time")
/** 缁撴潫鏃堕棿 */
- private LocalDateTime endTime;
+ private Date endTime;
@TableField("teacher_id")
/** 鍒涘缓鑰佸笀 */
private Integer teacherId;
+ @TableField(value = "create_time", fill = FieldFill.INSERT)
+ private Date createTime;
+ @Version
+ private Integer updateVersion;
}
--
Gitblit v1.8.0