From 3a82a5078037deef31caf3694acc36c4f386ffb3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Nov 2021 11:14:43 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 63f0cfb..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,11 +36,12 @@
private String weight;
/**
- * 订单状态 状态 1-待接单2-已接单3-已完成(用户)/待入库(集物员)4-已完成5-已取消
+ * 订单状态 状态 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;
/**
@@ -69,5 +70,7 @@
* 集物员ID
*/
private String jhyId;
+ private String unitName;
+ private String houseNumber;
}
--
Gitblit v1.9.1