Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1

mitao

2025-03-10 9dbb6c26c81e94e8f969805b40b0e183bf306f83

 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;