Merge remote-tracking branch 'origin/master'

mitao

2024-07-17 e2659d65be6494f9f737cddcec8292ac39cc5c06

 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;