From 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 29 十月 2024 13:32:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/domain/entity/Subject.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/Subject.java b/src/main/java/com/ycl/jxkg/domain/entity/Subject.java
index a76e8b0..a8370e4 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/Subject.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Subject.java
@@ -1,14 +1,18 @@
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.StatusEnum;
import lombok.Data;
+import lombok.experimental.Accessors;
-import java.io.Serializable;
+import java.util.Date;
@Data
@TableName("t_subject")
+@Accessors(chain = true)
public class Subject extends AbsEntity {
/**
@@ -18,22 +22,18 @@
private String name;
/**
- * 骞寸骇 (1-12) 灏忓 鍒濅腑
- */
- @TableField("level")
- private Integer level;
-
- /**
- * 涓�骞寸骇銆佷簩骞寸骇绛�
- */
- @TableField("level_name")
- private String levelName;
-
- /**
* 鎺掑簭
*/
@TableField("item_order")
private Integer itemOrder;
+ @TableField("create_user")
+ private Integer createUser;
+
+ @TableField(value = "create_time", fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @TableField(value = "status")
+ private StatusEnum status;
}
--
Gitblit v1.8.0