Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-10 0858bae1cdbfe973ca53985e151cae48b81c8b0b

 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;