From ef4ad171c46f615a5b719bac70c468b561bc08ac Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 08 Dec 2021 11:22:43 +0800
Subject: [PATCH] Merge branch 'score-shop' into xc-prd
---
gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java | 4 +++-
1 files changed, 3 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 72d3d33..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,7 +36,7 @@
private String weight;
/**
- * 订单状态 状态 1-待接单2-已接单3-已完成(用户)/待入库(集物员)4-已完成5-已取消
+ * 订单状态 状态 1-待接单2-已接单3-已完成(用户)/待入库(集物员)5-已取消
*/
private Integer status;
public static final Integer ORDER_STATUS_WAITING = 1;
@@ -70,5 +70,7 @@
* 集物员ID
*/
private String jhyId;
+ private String unitName;
+ private String houseNumber;
}
--
Gitblit v1.9.1