From 01eef3efb95945e47f0864253d96bfdc2a5e418a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 Nov 2021 17:09:58 +0800
Subject: [PATCH] 20211108

---
 gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java
index 9443cd9..4856e1a 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java
@@ -36,10 +36,13 @@
     private String weight;
 
     /**
-     * 订单状态 状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消
+     * 订单状态 状态 1-待接单2-已接单3-已完成(用户)/待入库(集物员)5-已取消
      */
     private Integer status;
     public static final Integer ORDER_STATUS_WAITING = 1;
+    public static final Integer ORDER_STATUS_IMG = 2;
+    public static final Integer ORDER_STATUS_CONFIRM = 3;
+    public static final Integer ORDER_STATUS_CANCEL = 5;
 
     /**
      * 评论
@@ -66,6 +69,8 @@
     /**
      * 集物员ID
      */
-    private String jyhId;
+    private String jhyId;
+    private String unitName;
+    private String houseNumber;
 
 }

--
Gitblit v1.9.1