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

lidongdong

2022-12-08 284a4b9bda8f7c09f550c15e71ced282e5531a08

 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;
}