# Conflicts: # dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java # dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/UserLoginService.java # dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java # dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java
shijie