From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingOrderVO.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingOrderVO.java
index 3712869..aeb1811 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingOrderVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/NewFightShoppingOrderVO.java
@@ -81,6 +81,15 @@
@ApiModelProperty(value = "经度")
private String lng;
+ @ApiModelProperty(value = "商家id")
+ private String merchantId;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty(value = "订单类型 1 线上订单 2线下商家订单")
+ private String orderType;
+
@ApiModelProperty(value = "兑换状态（1每天 2周一到周五 3周末）")
private String businessType;
--
Gitblit v1.7.1