Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-10 0858bae1cdbfe973ca53985e151cae48b81c8b0b

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

@@ -30,7 +30,6 @@
    private IMemberArticleCollectionService memberArticleCollectionService;

    @PostMapping("/saveMemberArticleCollection")
    @ResponseBody
    @ApiOperation(value = "用户端-文章收藏和取消收藏")
    public R saveMemberArticleCollection( @RequestBody MemberArticleCollectionDTO memberArticleCollectionDTO) {
        memberArticleCollectionService.saveMemberArticleCollection(memberArticleCollectionDTO);
@@ -39,9 +38,8 @@


    @PostMapping("/getMemberArticleCollection")
    @ResponseBody
    @ApiOperation(value = "用户端-获取用户收藏资讯")
    public R<PageDTO<MemberArticleCollectionVO>> getMemberArticleCollection( ArticleDTO articleDTO) {
    public R<PageDTO<MemberArticleCollectionVO>> getMemberArticleCollection(@RequestBody ArticleDTO articleDTO) {
        return R.ok(memberArticleCollectionService.getMemberArticleCollection(articleDTO));
    }