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

huanghongfa

2021-11-05 0d5b156f0f2c48a06974361532b7505e92db633b

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

@@ -56,4 +56,6 @@
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告")
    private Integer type;

    private Long communityId;

}