Merge branch 'huacheng_push' into huacheng_test

zhaozhengjie

2022-09-08 bb37b8ff2eac4cb2ab9997a50bf68f5bde16d661

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

@@ -92,4 +92,19 @@

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