From bec6f7988cf5245afbb5a1f53ed5d607ffb864d0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:16:51 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 b940e95..6be5a5c 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
@@ -21,7 +21,7 @@
 import com.yeshi.fanli.entity.bus.user.HongBao;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.bus.user.UserRankings;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
+import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
 import com.yeshi.fanli.service.inter.user.UserRankingsService;
 
 import net.sf.json.JSONObject;
@@ -32,9 +32,10 @@
 
 	@Resource
 	private UserRankingsService userRankingsService;
-
+	
 	@Resource
-	private HongBaoService hongBaoService;
+	private HongBaoV2CountService hongBaoV2CountService;
+
 
 	/**
 	 * 杩斿埄鍒告帓琛屾

--
Gitblit v1.8.0