From 62fbd9f556d6b114415ef48b4ed9d6dcde01b139 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 04 十二月 2018 15:41:01 +0800
Subject: [PATCH] Merge branch 'dev-goods'

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
index cc5a8d1..83c6462 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
@@ -9,6 +9,7 @@
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
 
 import com.alipay.api.AlipayApiException;
 import com.yeshi.fanli.entity.accept.AcceptData;
@@ -29,7 +30,6 @@
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;
 import com.yeshi.fanli.service.inter.config.SystemService;
-import com.yeshi.fanli.service.inter.goods.CollectionGoodsService;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
@@ -49,13 +49,11 @@
 import com.yeshi.fanli.service.inter.user.TBPidService;
 import com.yeshi.fanli.service.inter.user.UserAccountService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.service.inter.user.WxDownService;
 import com.yeshi.fanli.util.GsonUtil;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.account.UserUtil;
 import com.yeshi.fanli.util.wx.WXLoginUtil;
-import org.yeshi.utils.JsonUtil;
 
 import net.sf.json.JSONObject;
 
@@ -118,12 +116,7 @@
 	private AccountMessageService accountMessageService;
 
 	@Resource
-	private CollectionGoodsService collectionGoodsService;
-	@Resource
 	private HongBaoManageService hongBaoManageService;
-
-	@Resource
-	private WxDownService wxDownService;
 
 	@Resource
 	private UserAccountService userAccountService;

--
Gitblit v1.8.0