Yueng
|
016887afc2
|
Merge remote-tracking branch 'origin/psr'
# Conflicts:
# cloud-gateway/src/main/resources/bootstrap.yml
# cloud-modules/cloud-Saas-Service/src/main/resources/bootstrap.yml
# cloud-modules/cloud-Vehicle-Simulation/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarInformationController.java
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarMessageController.java
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessage.java
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarInformationMapper.java
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarMessageService.java
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarInformationServiceImpl.java
# cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarInformationMapper.xml
# cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml
# cloud-modules/pom.xml
# pom.xml
|
2024-09-27 12:07:08 +08:00 |