From 01329695ebf6eea6576d76825181b2f3833297e8 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 16:12:38 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

---
 src/main/java/com/moral/service/impl/UserServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/UserServiceImpl.java b/src/main/java/com/moral/service/impl/UserServiceImpl.java
index 1655652..e6a32cb 100644
--- a/src/main/java/com/moral/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/UserServiceImpl.java
@@ -12,7 +12,7 @@
 @Service
 public class UserServiceImpl implements UserService {
 
-    //@Autowired
+    @Autowired
     private UserMapper userMapper;
 
     @Override

--
Gitblit v1.8.0