Conflicts: app/src/main/java/com/yiring/app/Application.java app/src/main/resources/application.yml basic-auth/src/main/resources/application-auth.yml basic-common/doc/build.gradle build.gradle
