From 23e78efefd96d28f0c492348f3cb8a9e6cdcbbab Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 31 五月 2024 12:31:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleDTO.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleDTO.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleDTO.java
index 6534366..1a81797 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleDTO.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/dto/ArticleDTO.java
@@ -3,16 +3,18 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.core.enums.ArticleTypeEnum;
+import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
@Data
-public class ArticleDTO {
+public class ArticleDTO extends BasePage {
@ApiModelProperty(value = "资讯id")
private Long id;
- @ApiModelProperty(value = "资讯类型 1=平台发布 2=用户发布")
- private ArticleTypeEnum articleType;
+ @ApiModelProperty(value = "资讯类型 0=全部,1=平台发布 2=用户发布")
+ private Integer articleType;
@ApiModelProperty(value = "资讯标题")
private String title;
@@ -20,9 +22,12 @@
@ApiModelProperty(value = "资讯内容")
private String content;
- @ApiModelProperty(value = "资讯图片 ['a','b','c','d','e']")
- private String images;
-
@ApiModelProperty(value = "资讯视频")
private String videoUrl;
+
+ @ApiModelProperty(value = "会员id")
+ private Long memberId;
+
+ @ApiModelProperty(value = "资讯图片")
+ private MultipartFile[] rticleImageUrl;
}
--
Gitblit v1.7.1