Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-13 e5d95a1d3d00710a9f4a1c3cd9c8bb87c274bde1

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