Merge branch 'huacheng_shuangzheng' into huacheng_test

101captain

2022-06-17 1f615d5c6ac7b116c0bb3f075331197f284b998c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java

@@ -78,4 +78,7 @@
    private Integer belongType;
    @ApiModelProperty("处理状态 0 否 1是")
    private Integer solveStatus;

    @ApiModelProperty("预计服务时长")
    private String targetServiceTime;
}