Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-29 1f649d3a2a7b631b71d16bcc046c3c6c32c2ecbf

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