# Conflicts: # hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java # hai-user/src/main/java/com/web/controller/LoginController.java