Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

mitao

2025-03-18 d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256

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

@@ -93,6 +93,18 @@
    @ApiModelProperty("订单取消剩余倒计时")
    private Long cancelCountdown;

    @ApiModelProperty("支付方式")
    private String paymentMethod;

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

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

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

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