Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

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

@@ -120,6 +120,7 @@
            memberArticleCollectionVO.setContent(byId.getContent());
            memberArticleCollectionVO.setImages(byId.getImages());
            memberArticleCollectionVO.setTitle(byId.getTitle());
            memberArticleCollectionVO.setCreateTime(byId.getCreateTime());
            memberArticleCollectionVO.setId(byId.getId());
            R<Member> membeOne = memberClient.getMembeOne(byId.getMemberId(),
                    SecurityConstants.INNER);