From ae21df72cd3acbc8eb2ec4b9e55529ca9d02498c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Jul 2021 10:11:04 +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 | 2 +-
1 files changed, 1 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..c0b3a2b 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;
--
Gitblit v1.9.1