From ac8e9b9d4e5f15369c1c1df49c63378fb1ae6f7b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 23 八月 2019 17:31:18 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java
index 3aaa9e2..37cd3a1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java
@@ -106,7 +106,7 @@
 
 	}
 
-	@Cacheable(value = "integralGetCache", key = "'addSearchResultScan-'+#uid+'-'+kw")
+	@Cacheable(value = "integralGetCache", key = "'addSearchResultScan-'+#uid+'-'+#kw")
 	@Override
 	public void addSearchResultScan(Long uid, String kw) throws IntegralGetException {
 		System.out.println("鎼滅储");
@@ -453,7 +453,7 @@
 	@Override
 	public void addSetNickname(Long uid) {
 		try {
-			addEventStatistic(uid, TaskUniqueKeyEnum.setNickname.name(), null);
+			addEventStatistic(uid, TaskUniqueKeyEnum.setNickName.name(), null);
 		} catch (Exception e) {
 			LogHelper.errorDetailInfo(e);
 		}

--
Gitblit v1.8.0