From 910ca2f0f8594a1353f822d653c88a7924902217 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Jun 2021 19:32:18 +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 c0fc58f..754cf59 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
@@ -15,6 +15,8 @@
private String orderNo;
+ private String username;
+
private String phone;
private String area;
@@ -37,6 +39,7 @@
* 订单状态 状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消
*/
private Integer status;
+ public static final Integer ORDER_STATUS_WAITING = 1;
/**
* 评论
@@ -63,6 +66,6 @@
/**
* 集物员ID
*/
- private String jyhId;
+ private String jhyId;
}
--
Gitblit v1.9.1