From 9dbb6c26c81e94e8f969805b40b0e183bf306f83 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 10 三月 2025 13:55:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1

---
 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/Article.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/Article.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/Article.java
index 5948965..bf9614b 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/Article.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/Article.java
@@ -53,11 +53,11 @@
     @ApiModelProperty(value = "资讯视频")
     private String videoUrl;
 
-    @ApiModelProperty(value = "状态 1=待审核 2=已通过 3=已拒绝 4被举报")
+    @ApiModelProperty(value = "状态 1=待审核 2=已通过 3=已拒绝")
     private AuditStatusEnum status;
 
-    @ApiModelProperty(value = "举报用户")
-    private String reportBy;
+    @ApiModelProperty(value = "举报用户id")
+    private Long reportBy;
 
     @ApiModelProperty(value = "举报时间")
     private LocalDateTime reportedTime;
@@ -100,6 +100,9 @@
     @ApiModelProperty(value = "上架状态 上架中 已下架")
     private ListingStatusEnum listingStatus;
 
-    @ApiModelProperty(value = "举报状态")
-    private Boolean reportStatus;
+    @ApiModelProperty(value = "是否被举报")
+    private Boolean reported;
+
+    @ApiModelProperty(value = "资讯评论查看状态 1:未查看 2:已查看")
+    private Integer readStatus;
 }

--
Gitblit v1.7.1