From dd8aa15e284c9d4c0c858e22f4130d1785261e01 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 10 三月 2022 09:17:40 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsOrderVO.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsOrderVO.java
index c13eb04..9ee3897 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsOrderVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsOrderVO.java
@@ -89,4 +89,22 @@
 
     @ApiModelProperty("openid")
     private String openId;
+
+    @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;
 }

--
Gitblit v1.7.1