From 2749626492862339a50789933bb110f691426225 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 07 八月 2024 16:40:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TNotice.java |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TNotice.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TNotice.java
index d658a1a..a124b72 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TNotice.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TNotice.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,7 +25,7 @@
 @EqualsAndHashCode(callSuper = false)
 @TableName("t_notice")
 @ApiModel(value="TNotice对象", description="")
-public class TNotice implements Serializable {
+public class TNotice extends BasePojo {
 
     private static final long serialVersionUID = 1L;
 
@@ -44,14 +45,6 @@
     @TableField("end_time")
     private LocalDateTime endTime;
 
-    @ApiModelProperty(value = "添加时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "删除(0=否,1=是)")
-    @TableField("del_flag")
-    @TableLogic
-    private Integer delFlag;
 
 
 }

--
Gitblit v1.7.1