From 48bb23486bc018d13014d8acde4fb51ec3a78a36 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 24 Sep 2022 11:27:59 +0800
Subject: [PATCH] Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy

---
 src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
index 72b0f24..cb4a69a 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
@@ -115,10 +115,23 @@
     private String addressArea;
     @TableField(exist = false)
     private String detailAddress;
-
-
+    @TableField(exist = false)
+    private Double leaderLongitude;
+    @TableField(exist = false)
+    private Double leaderLatitude;
     /**
      * 微信订单编号
      */
     private String wxOrderNo;
+    /**
+     * 配送状态 1:待配送 2:配送中 3:已送达
+     */
+    private Integer deliveryState;
+    /**
+     * 是否送货上门  1:是 2:否
+     */
+    private Integer isHome;
+
+    @TableField(exist = false)
+    private String orderIds;
 }

--
Gitblit v1.9.1