Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-03-30 a6208e99d08435959b234141f0fe0d4f81c47b00

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

@@ -142,5 +142,8 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date singDate;

    @ApiModelProperty("党员活动是否个人发布  1 是 0 否")
    private Integer isPerson;


}