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

lidongdong

2022-10-18 a411c58990bb7979fdde17ba8f0c3b20ae5cec85

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsMerchantVO.java

@@ -69,5 +69,8 @@
    private Integer idleTotal;

    @ApiModelProperty("距离")
    private Integer distance;
    private Double distance;

    @ApiModelProperty("客服电话")
    private String customPhone;
}