From d397b54e3924c55e80782a80d9f19d616d40ccba Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Jun 2021 16:53:40 +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 |    1 +
 1 files changed, 1 insertions(+), 0 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..72d3d33 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
@@ -41,6 +41,7 @@
     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;
 
     /**

--
Gitblit v1.9.1