 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 |
 王鑫
|
14cc2afd35
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-enterprise/pom.xml
|
2024-09-30 16:30:20 +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 |
ruyaxie
|
61dc7f9277
|
Merge remote-tracking branch 'origin/dev.parse' into dev.parse
# Conflicts:
# cloud-common/cloud-common-kafka/pom.xml
# cloud-common/pom.xml
# cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml
# cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/logback/dev.xml
# cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/logback/prod.xml
# cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/logback/test.xml
|
2024-09-30 09:12:02 +08:00 |
|
ruyaxie
|
ecf81cc79e
|
feat():修复代码缓存框架
|
2024-09-30 01:22:53 +08:00 |
|
王鑫
|
dd94f2e39e
|
fix():修复框架bug
|
2024-09-29 22:45:06 +08:00 |