Merge remote-tracking branch 'origin/master'

mitao

2024-06-12 e45091fdf9e412c758bc320f3f5664081631fa4b

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java

@@ -119,7 +119,7 @@
            Member data = membeOne.getData();
            memberArticleCollectionVO.setMemberNickname(data.getNickname());
            memberArticleCollectionVO.setMemberAvatar(data.getAvatar());
            memberArticleCollectionVO.setIsCollect(1);
            memberArticleCollectionVO.setIsCollect(2);

        }
        return articleCommentsVOPageDTO;