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/Classes.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/Classes.java b/src/main/java/com/ycl/jxkg/domain/entity/Classes.java
index bdb9f0c..8956d34 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/Classes.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Classes.java
@@ -1,10 +1,14 @@
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 com.ycl.jxkg.domain.base.AbsEntity;
+import com.ycl.jxkg.enums.general.ClassesStatusEnum;
import lombok.Data;
+
+import java.util.Date;
/**
* 鐝骇
@@ -32,7 +36,7 @@
@TableField("status")
/** 鐝骇鐘舵�� */
- private String status;
+ private ClassesStatusEnum status;
@TableField("verify_status")
/** 楠岃瘉鐘舵�� */
@@ -40,15 +44,16 @@
@TableField("start_time")
/** 寮�濮嬫椂闂� */
- private String startTime;
+ private Date startTime;
@TableField("end_time")
/** 缁撴潫鏃堕棿 */
- private String endTime;
+ private Date endTime;
@TableField("remark")
/** 澶囨敞 */
private String remark;
-
+ @TableField(value = "create_time", fill = FieldFill.INSERT)
+ private Date createTime;
}
--
Gitblit v1.8.0