Merge branch 'hemenkou_dev' into dev

101captain

2022-03-02 60784a329fd3cf9f4b6a75b8dc39ff79bd907dc6

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

@@ -67,4 +67,10 @@

    @ApiModelProperty("空闲戳戳点")
    private Integer idleTotal;

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

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