From be641cbe14bf20c807dccceb1c4b825d80443aed Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 08 一月 2020 14:42:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 26e9653..3fbc0ff 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
@@ -16,6 +16,7 @@
 import com.google.gson.Gson;
 import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.user.LostOrder;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.order.LostOrderService;
 import com.yeshi.fanli.util.Constant;
@@ -210,8 +211,8 @@
 	@RequestMapping("getConfig")
 	public void getConfig(AcceptData acceptData, PrintWriter out) {
 		JSONObject data = new JSONObject();
-		data.put("what", configService.get("lost_order_help_what"));
-		data.put("reason", configService.get("lost_order_help_reason"));
+		data.put("what", configService.get(ConfigKeyEnum.lostOrderHelpWhat.getKey()));
+		data.put("reason", configService.get(ConfigKeyEnum.lostOrderHelpReason.getKey()));
 		out.print(JsonUtil.loadTrueResult(data));
 	}
 

--
Gitblit v1.8.0