Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-27 fe5224b371593245312f32495bf7752c837ed633

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

@@ -96,6 +96,15 @@
    @ApiModelProperty("支付方式")
    private String paymentMethod;

    @ApiModelProperty("商家地址")
    private String address;

    @ApiModelProperty("纬度")
    private String lat;

    @ApiModelProperty("经度")
    private String lon;

    @ApiModelProperty(value = "用户真实ip", hidden = true)
    private String clientIp;
}