From 2427b05aeca08ee3c4998843bf749d35440d461b Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 15 六月 2024 21:33:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/Article.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 79eddde..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
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.enums.ArticleTypeEnum;
import com.ruoyi.common.core.enums.AuditStatusEnum;
+import com.ruoyi.common.core.enums.ListingStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -52,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;
@@ -96,5 +97,9 @@
@ApiModelProperty(value = "拒绝原因")
private String refuseComment;
+ @ApiModelProperty(value = "上架状态 上架中 已下架")
+ private ListingStatusEnum listingStatus;
+ @ApiModelProperty(value = "是否被举报")
+ private Boolean reported;
}
--
Gitblit v1.7.1