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

tangxiaobao

2022-02-22 4e1bb5d40063abfa1f43206b4ba91a26fac1cae7

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