Yueng c415b7676f Merge remote-tracking branch 'origin/dev.wei' ... # Conflicts: # 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/mapper/car/CarInformationMapper.xml # pom.xml		2024-09-27 11:52:11 +08:00
..
cloud-Vehicle-Simulation	Merge branch 'master' of https://gitea.qinmian.online/a_bazu/cloud-server-8 into dev.yang	2024-09-26 14:57:53 +08:00
cloud-electronic	Merge branch 'master' of https://gitea.qinmian.online/a_bazu/cloud-server-8 into dev.yang	2024-09-26 14:57:53 +08:00
cloud-modules-car	Merge remote-tracking branch 'origin/dev.wei'	2024-09-27 11:52:11 +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	删除 cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml	2024-09-26 10:12:18 +08:00
cloud-modules-system	Merge remote-tracking branch 'origin/dev.wei'	2024-09-27 11:52:11 +08:00
cloud-test	初始化	2024-09-21 11:52:20 +08:00
pom.xml	Merge branch 'dev.yang'	2024-09-27 11:01:15 +08:00