Merge remote-tracking branch 'origin/master'

huanghongfa

2021-12-28 8dd5c057222ea4f6d22d6bc3fba468600f14a330

 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;

}