Merge branch 'test' into 'test_bak'

罗元桥

2021-09-27 faae303cd25f90b1c732b6bc737ede8b8ab714a0

 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;

    /**
     * 名称