liwentao
a7f699a8b4
# Conflicts: # gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java # gym-manage-api/manage-app/src/main/resources/application-dev.yml # gym-manage-api/manage-app/src/main/resources/application.yml # Conflicts: # gym-manage-api/pom.xml