Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

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

@@ -26,5 +26,7 @@
    private Integer volunteer;
    @ApiModelProperty("党组织")
    private Integer partyOrg;
    @ApiModelProperty("人大代表")
    private Integer dpcNum;
}