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
..
cloud-Saas-Service/src/main/resources	Merge remote-tracking branch 'origin/psr'	2024-09-27 12:07:08 +08:00
cloud-Vehicle-Simulation	Merge remote-tracking branch 'origin/psr'	2024-09-27 12:07:08 +08:00
cloud-electronic	Merge remote-tracking branch 'origin/psr'	2024-09-27 12:07:08 +08:00
cloud-modules-car	Merge remote-tracking branch 'origin/psr'	2024-09-27 12:07:08 +08:00
cloud-modules-file	删除 cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml	2024-09-26 10:12:03 +08:00
cloud-modules-gen	Merge remote-tracking branch 'origin/psr'	2024-09-27 12:07:08 +08:00
cloud-modules-system	Merge remote-tracking branch 'origin/dev.wei'	2024-09-27 11:52:11 +08:00
cloud-modules-warn	feat():连接车辆管理	2024-09-26 14:53:11 +08:00
cloud-modules-wechat	feat():初始化	2024-09-21 11:51:40 +08:00
cloud-test	初始化	2024-09-21 11:52:20 +08:00
pom.xml	Merge remote-tracking branch 'origin/psr'	2024-09-27 12:07:08 +08:00