You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
shijie
c93b5a6c25
Merge remote-tracking branch 'origin/master'
# Conflicts:
# dq-financial-hrms-auth/pom.xml
# dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/config/AuthorizationServer.java
# dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/config/SecurityConfig.java
# dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/config/TokenConfig.java
# 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-govern-gateway/src/main/resources/jwt.properties
|
4 years ago |
.. |
src
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
pom.xml
|
找回密码
|
4 years ago |