Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

zhaozhengjie

2022-09-29 d4e3d2ce70f38f5a41ce336e62102e4da8698ba1

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