虽然不知道哪来的后端分支，但还是提交一下

# Conflicts:
#	src/main/java/com/example/demo/controller/ConsumeController.java
#	src/main/java/com/example/demo/controller/RechargeController.java
#	src/main/resources/application.yml

src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java

@@ -10,8 +10,6 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-
-
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -24,9 +22,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
-
 import java.util.List;
-import java.util.Objects;
 
 @Transactional
 @Service
@@ -86,6 +82,7 @@ public class AdminServiceImpl implements AdminService {
         return new PageInfo<>(list);
 
     }
+    // 修改登录方法
     @Override
     public Admin login(Admin admin) throws Exception {
 try {