From 5396bf8f7e14a559f825e275579e0091a9d29e73 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 十一月 2019 16:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java | 2 +-
1 files changed, 1 insertions(+), 1 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 0b99c7b..26e9653 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,7 +85,7 @@
&& 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)) {
// 鐢宠瘔澶辫触
--
Gitblit v1.8.0