Merge remote-tracking branch 'origin/master'

rentaiming

2024-06-21 0b007e7fe9ef41fbaa13507d2520a5e8e4faeb3c

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/MemberArticleCollectionVO.java

@@ -34,7 +34,10 @@
    @ApiModelProperty(value = "会员名称")
    private String memberNickname;

    @ApiModelProperty("是否收藏 1收藏， 2 未收藏")
    @ApiModelProperty(value = "头像")
    private String memberAvatar;

    @ApiModelProperty("是否收藏 1未收藏， 2 收藏")
    private Integer isCollect;

    @ApiModelProperty(value = "创建时间")