Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

101captain

2022-07-23 03d92ecbd463371602806fbe3942a108c891098d

Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentAppVO.java

@@ -25,9 +25,11 @@
    private Long id;

    @ApiModelProperty("邻里圈id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long circleId;

    @ApiModelProperty("用户id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;

    @ApiModelProperty("评论用户名字")

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

@@ -556,7 +556,7 @@
    @ApiOperation(value = "动态/政策文件详情", response = PartyBuildingComPbDynVO.class)
    @GetMapping("infodynamic")
    public R infoYnamic(@RequestParam("id") Long id) {
        return partyBuildingService.infoYnamic(id);
        return partyBuildingWestService.infoYnamic(id);
    }

    @ApiOperation(value = "分页查询党员动态/政策文件", response = PartyCommitteeVO.class)