Merge branch 'test' into zhaozhengjie1104

101captain

2021-11-19 8fefe6224227771b9c11b6a43094e4eee2384585

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java

@@ -104,4 +104,7 @@
    @ApiModelProperty("是否是个人发起 1 是 0 否")
    private Integer isPerson;

    @ApiModelProperty("二维码类型 1居民，志愿者 2党员")
    private Integer codeType;

}