Merge branch 'master' into hemenkou_dev

101captain

2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d

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

@@ -51,9 +51,11 @@
    private Integer status;

    /**
     * 分类类型 1服务类型分类 2技能分类
     * 分类类型 1服务类型分类 2技能分类 3通知公告
     */
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类")
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告")
    private Integer type;

    private Long communityId;

}