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

puhanshu

2022-03-14 b92edf56e7e25440e7c46b967aa5373a7a8b25c2

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