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/ClientJspController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
index b391a9f..3e75e93 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -26,6 +26,7 @@
 import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
 import com.yeshi.fanli.entity.system.CustomerContent;
 import com.yeshi.fanli.entity.system.CustomerName;
 import com.yeshi.fanli.entity.system.SystemClientParams;
@@ -159,7 +160,7 @@
 
 	@RequestMapping("share")
 	public String getShare(Model model, String uid) {
-		String value = configService.get("share_message");
+		String value = configService.get(ConfigKeyEnum.shareMessage.getKey());
 		try {
 			if (uid == null) {
 				uid = "0";
@@ -178,7 +179,7 @@
 
 	@RequestMapping("shares")
 	public String getShares(Model model, String uid) {
-		String value = configService.get("share_message");
+		String value = configService.get(ConfigKeyEnum.shareMessage.getKey());
 		try {
 			if (uid == null) {
 				uid = "0";

--
Gitblit v1.8.0