Merge branch 'test' into 'four_member'

罗元桥

2021-09-24 09e41d546b030b47661877d4b8141c88584d7598

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

@@ -14,7 +14,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    private Integer id;
    private Long id;

    /**
     * 名称