Merge branch 'shuangzheng2' into huacheng_test

101captain

2022-08-01 f4d47d91a8bf41426497a0c42c10f5a78af0259b

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