From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java
index 7fc5c4c..135a9e6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java
@@ -85,16 +85,16 @@
&& order.getResultCode() == LostOrder.RESULT_CODE_SUCCESS) {
// 鐢宠瘔鎴愬姛
json.put("state", 1);
- json.put("stateDesc", "鐢宠瘔鎴愬姛锛岃鍦ㄨ鍗曞垪琛ㄤ腑鏌ョ湅");
+ json.put("stateDesc", "璁㈠崟鎵惧洖鎴愬姛锛岃鎴戠殑-璁㈠崟涓煡鐪�");
} else if (order.getState() == 2 || (order.getState() == 1 && order.getResultCode() != null
&& order.getResultCode() == LostOrder.RESULT_CODE_FAIL)) {
// 鐢宠瘔澶辫触
json.put("state", 2);
- json.put("stateDesc", "鐢宠瘔澶辫触");
+ json.put("stateDesc", "璁㈠崟鎵惧洖澶辫触");
} else {
// 澶勭悊涓�
json.put("state", 0);
- json.put("stateDesc", "瀹℃牳涓�");
+ json.put("stateDesc", "璁㈠崟鎵惧洖涓�");
}
data.add(json);
}
--
Gitblit v1.8.0