From 7fd0771bbebafa36bc007ceb581cdaab4d290c82 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 06 六月 2024 09:18:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/ycl/jxkg/domain/entity/Subject.java |   23 ++++++++++-------------
 1 files changed, 10 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..e305bcd 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/Subject.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/Subject.java
@@ -1,11 +1,12 @@
 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 lombok.Data;
 
-import java.io.Serializable;
+import java.util.Date;
 
 @Data
 @TableName("t_subject")
@@ -18,22 +19,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 Integer status;
 
 }

--
Gitblit v1.8.0