微醺 c8fd288cc4 Merge branch 'dev.carManage' of https://gitea.qinmian.online/six-vehicle/cloud-server into dev ... # Conflicts: # cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java # cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessage.java # cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessageType.java # cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java # cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarType.java # cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarCompanyMapper.java # cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarCompanyService.java # cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarService.java # cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarCompanyServiceImpl.java # cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarServiceImpl.java		2024-09-28 20:27:54 +08:00
..
java/com/muyu/enterprise	Merge branch 'dev.carManage' of https://gitea.qinmian.online/six-vehicle/cloud-server into dev	2024-09-28 20:27:54 +08:00
resources	Merge branch 'dev.carManage' of https://gitea.qinmian.online/six-vehicle/cloud-server into dev	2024-09-28 20:27:54 +08:00