From 9db53b847ba90d437d9545485416f23887adf934 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 二月 2019 11:38:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java
index 51108fa..b940e95 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java
@@ -12,10 +12,9 @@
 
 import javax.annotation.Resource;
 
-import net.sf.json.JSONObject;
-
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -24,9 +23,8 @@
 import com.yeshi.fanli.entity.bus.user.UserRankings;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
 import com.yeshi.fanli.service.inter.user.UserRankingsService;
-import com.yeshi.fanli.util.annotation.RequestNoSignValidate;
 
-import org.yeshi.utils.JsonUtil;
+import net.sf.json.JSONObject;
 
 @Controller
 @RequestMapping("api/apph5/v1/rewardRank")

--
Gitblit v1.8.0