From c184fa19557e117c81b83c9916c8d012e5a778d4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 22 一月 2025 08:59:34 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java |   41 ++++++++++++-----------------------------
 1 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java
index 80d9146..b57e911 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java
@@ -1,11 +1,14 @@
 package com.ruoyi.system.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,33 +20,34 @@
  * </p>
  *
  * @author xiaochen
- * @since 2025-01-17
+ * @since 2025-01-20
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("t_information")
 @ApiModel(value="TInformation对象", description="资讯管理")
-public class TInformation implements Serializable {
+public class TInformation extends BaseModel {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId("id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "标题")
-    @TableField("titleName")
+    @TableField("title_name")
     private String titleName;
 
     @ApiModelProperty(value = "排序")
-    @TableField("sortBy")
+    @TableField("sort_by")
     private Integer sortBy;
 
     @ApiModelProperty(value = "信息来源")
-    @TableField("infoSource")
+    @TableField("info_source")
     private String infoSource;
 
     @ApiModelProperty(value = "发布时间")
-    @TableField("releaseTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField("release_time")
     private LocalDateTime releaseTime;
 
     @ApiModelProperty(value = "内容")
@@ -53,27 +57,6 @@
     @ApiModelProperty(value = "附件")
     @TableField("attachment")
     private String attachment;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("createTime")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField("updateTime")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "创建人")
-    @TableField("createBy")
-    private String createBy;
-
-    @ApiModelProperty(value = "修改人")
-    @TableField("updateBy")
-    private String updateBy;
-
-    @ApiModelProperty(value = "是否删除 0=否 1=是")
-    @TableField("isDelete")
-    @TableLogic
-    private Integer isDelete;
 
 
 }

--
Gitblit v1.7.1