Merge remote-tracking branch 'SAMS/v0.2' into v0.2

# Conflicts:
#	src/main/java/com/bruce/sams/service/impl/AuthServiceImpl.java

src/main/java/com/bruce/sams/service/impl/AuthServiceImpl.java

@@ -47,7 +47,6 @@ public class AuthServiceImpl implements AuthService {
         } else if (!loginRequest.getEmail().isEmpty()) {
             user = userMapper.findByEmail(loginRequest.getEmail());
         }
-        System.out.println(user);
         // 用户不存在
         if (user == null) {
             throw new UserNotFoundException();
@@ -55,7 +54,6 @@ public class AuthServiceImpl implements AuthService {
 
         // 检查密码是否匹配
         if (!PasswordUtil.matches(loginRequest.getPassword(), user.getPassword())) {
-
             throw new PasswordIncorrectException();
         }