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

lidongdong

2022-11-23 8f9845717f6989792e2a6003adf5fe12ff0a9540

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