From 444c51801401d91b15184bfa0ea79574e5712c9a Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:31:09 +0800
Subject: [PATCH] 冲突提交

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
index 2456d67..a4485a6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
@@ -135,7 +135,6 @@
 	@Resource
 	private UserRankService userRankService;
 	
-
 	@Resource
 	private UserMoneyDetailService userMoneyDetailService;
 

--
Gitblit v1.8.0