From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
index df62970..b3fcdd2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
@@ -45,8 +45,8 @@
} else if (0 == order.getOrderStatus()) {
state = CommonOrder.STATE_FK;
} else if (1 == order.getOrderStatus()) {
- state = CommonOrder.STATE_FK;
- } else if (2 == order.getOrderStatus()) {// 纭鏀惰揣
+ state = CommonOrder.STATE_FK;
+ } else if (2 == order.getOrderStatus()) {// 纭鏀惰揣
state = CommonOrder.STATE_JS;
} else if (3 == order.getOrderStatus()) {
state = CommonOrder.STATE_FK;
--
Gitblit v1.8.0