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/controller/forepart/vo/MemberArticleCollectionVO.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/MemberArticleCollectionVO.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/MemberArticleCollectionVO.java
index 8be13cc..79a808e 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/MemberArticleCollectionVO.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/MemberArticleCollectionVO.java
@@ -11,7 +11,7 @@
@Data
public class MemberArticleCollectionVO {
- private Integer id;
+ private Long id;
@ApiModelProperty(value = "收藏目标id")
private Long targetId;
@@ -37,7 +37,7 @@
@ApiModelProperty(value = "头像")
private String memberAvatar;
- @ApiModelProperty("是否收藏 1收藏， 2 未收藏")
+ @ApiModelProperty("是否收藏 1未收藏， 2 收藏")
private Integer isCollect;
@ApiModelProperty(value = "创建时间")
--
Gitblit v1.7.1