Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-05-08 9d5795249e3cf4c631eb73709d513c0a9ee27c9d

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java

@@ -214,7 +214,7 @@
        return communityService.deleteDynamic(comActDynVO);
    }

    @ApiOperation(value = "分页查询社区动态")
    @ApiOperation(value = "分页查询社区动态", response = ComActDynVO.class)
    @PostMapping("pagedynamic")
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
        Long communityId = this.getCommunityId();
@@ -222,7 +222,7 @@
        return communityService.pageDynamicByAdmin(comActDynVO);
    }

    @ApiOperation(value = "社区动态详情")
    @ApiOperation(value = "社区动态详情", response = ComActDynVO.class)
    @GetMapping("detaildynamic")
    @ApiImplicitParam(name = "id", value = "社区动态主键", required = true)
    public R detailDynamic(@RequestParam("id") Long id) {