chentaisen
|
5894089eef
|
Merge branch 'dev.car.gateway' into dev
# Conflicts:
# cloud-auth/src/main/resources/bootstrap.yml
# cloud-common/cloud-common-rabbit/pom.xml
# cloud-common/cloud-common-rabbit/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
# cloud-gateway/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-data-processing/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/bootstrap.yml
# cloud-modules/pom.xml
# cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
# init-file/cloud-system.sql
|
2024-10-08 09:11:14 +08:00 |