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

huanghongfa

2021-07-26 f7a3546bb4f6c0b00acb9899710ff25979a70be3

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageBackVO.java

@@ -50,6 +50,9 @@
    @ApiModelProperty(value = "回复人姓名",hidden = true)
    private String userName;

    @ApiModelProperty(value = "回复人职位")
    private String userJob;

    @ApiModelProperty(value = "社区主键",hidden = true)
    private Long communityId;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")