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

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

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

@@ -28,4 +28,10 @@
    private Integer adverPositionApplication;
    @ApiModelProperty("是否显示提醒（1.是 2.否）")
    private Integer isDisplay = 2;
    @ApiModelProperty("提供居民（1.是 2.否 ）")
    private Integer forMasses;
    @ApiModelProperty("提供党员（1.是 2.否 ）")
    private Integer forParty;
    @ApiModelProperty("提供志愿者（1.是 2.否 ）")
    private Integer forVolunteer;
}