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/ExamSubmitTemp.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/domain/entity/ExamSubmitTemp.java b/src/main/java/com/ycl/jxkg/domain/entity/ExamSubmitTemp.java
index 8d2a018..0d80671 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/ExamSubmitTemp.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/ExamSubmitTemp.java
@@ -1,5 +1,6 @@
 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.io.Serializable;
@@ -38,9 +39,20 @@
     private String examSubmit;
 
     @TableField("status")
-    /** 鐘舵�侊細涓存椂銆佷繚瀛� */
+    /** 鐘舵�侊細涓存椂銆佸畬鎴� */
     private ExamSubmitTempStatusEnum status;
 
-    @TableField("create_time")
+    @TableField("mark_paper_status")
+    /** 鐘舵�侊細涓存椂銆佸畬鎴� */
+    private ExamSubmitTempStatusEnum markPaperStatus;
+
+    @TableField("question_answer_copy")
+    /** 璇曞嵎涓鐩搴旂殑绛旀 */
+    private String questionAnswerCopy;
+
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
+
+    @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
 }

--
Gitblit v1.8.0