From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java | 82 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 82 insertions(+), 0 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
new file mode 100644
index 0000000..3132361
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java
@@ -0,0 +1,82 @@
+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.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;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 资讯管理
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_information")
+@ApiModel(value="TInformation对象", description="资讯管理")
+public class TInformation extends BaseModel {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private String id;
+
+ @NotBlank(message = "资讯标题不能为空")
+ @ApiModelProperty(value = "标题")
+ @TableField("title_name")
+ private String titleName;
+
+ @ApiModelProperty(value = "排序")
+ @TableField("sort_by")
+ private Integer sortBy;
+
+ @ApiModelProperty(value = "信息来源")
+ @TableField("info_source")
+ private String infoSource;
+
+ @NotNull(message = "请选择发布时间")
+ @ApiModelProperty(value = "发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("release_time")
+ private LocalDateTime releaseTime;
+
+ @ApiModelProperty(value = "封面")
+ @TableField("cover")
+ private String cover;
+
+ @ApiModelProperty(value = "简介")
+ @TableField("brief_introduction")
+ private String briefIntroduction;
+
+ @ApiModelProperty(value = "内容")
+ @TableField("content")
+ private String content;
+
+ @ApiModelProperty(value = "附件 逗号分割 ")
+ @TableField("attachment")
+ private String attachment;
+
+ @ApiModelProperty(value = "附件名称 与附件顺序一致")
+ @TableField("attachment_name")
+ private String attachmentName;
+
+ @ApiModelProperty(value = "查看次数")
+ @TableField(exist = false)
+ private Integer viewCount;
+
+}
--
Gitblit v1.7.1