From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/Article.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 3322a36..06395ae 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;
@@ -99,5 +99,7 @@
@ApiModelProperty(value = "上架状态 上架中 已下架")
private ListingStatusEnum listingStatus;
-
+
+ @ApiModelProperty(value = "是否被举报")
+ private Boolean reported;
}
--
Gitblit v1.7.1