Commit Graph

10 Commits (a88e91c139b659e245a34721c10aa85711ca6238)

Author SHA1 Message Date
王鑫 a88e91c139 fix():修复缓存模块命名冲突问题 2024-10-01 19:20:43 +08:00
YangPeng d24110090c Merge branch 'dev.saas.yp' into dev
# Conflicts:
#	cloud-modules/cloud-modules-data-process/cloud-modules-data-process-common/src/main/java/com/muyu/data/basics/EventQueueConfig.java
#	cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarAndFenceGroupMiddleController.java
#	cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceUpdateController.java
#	cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MiddleController.java
#	cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarAndFenceGroupMiddleMapper.java
#	cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceUpdateMapper.java
#	cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarAndFenceGroupMiddleService.java
#	cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceUpdateService.java
#	cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarAndFenceGroupMiddleServiceImpl.java
#	cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java
#	cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceUpdateServiceImpl.java
#	cloud-modules/cloud-modules-enterprise/enterprise-cache/pom.xml
2024-09-30 16:38:41 +08:00
王鑫 afdc7b3421 fix():添加rabbitmq工具类,添加数据处理基础类,添加缓存 2024-09-30 16:28:08 +08:00
YangPeng 6f9079ec5f feat():修改JDK版本问题 2024-09-30 12:01:29 +08:00
王鑫 dd94f2e39e fix():修复框架bug 2024-09-29 22:45:06 +08:00
王鑫 3ac5b84ef6 Merge remote-tracking branch 'origin/dev.data.process' into dev.data.process
# Conflicts:
#	pom.xml
2024-09-29 17:59:23 +08:00
王鑫 1e19d99748 fix():提交数据处理模块的kafka工具类, 2024-09-29 16:58:58 +08:00
ruyaxie 05e6ecb947 fix():修复框架bug 2024-09-29 12:20:14 +08:00
YangPeng 49a7e0df4d fix():更新模块cloud-modules-enterprise 2024-09-29 10:31:52 +08:00
yanchouchou f0de024410 车联网第二期项目 2024-09-27 22:49:32 +08:00