Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-13 e5d95a1d3d00710a9f4a1c3cd9c8bb87c274bde1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ServiceStaticDTO.java

@@ -16,4 +16,6 @@
    private String phone;
    @ApiModelProperty("年份")
    private String year;
    @ApiModelProperty("服务方式（1.承接清单 2.单位参与社区活动 3.报到服务活动 4.党员参与社区活动）")
    private Integer serviceType;
}