Merge branch 'haucheng_panzhihua' into huacheng_test

101captain

2022-08-03 33fdf147bdaa73d2f97479d809597a99ad50a8bb

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

@@ -40,6 +40,7 @@
     * 通知类型id
     */
    @ApiModelProperty(value = "通知类型id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long columnId;

    /**