王鑫 b29b1f18db Merge branch 'dev.parse' into dev ... # Conflicts: # cloud-common/cloud-common-saas/pom.xml # cloud-modules/cloud-modules-data-process/cloud-modules-data-process-common/pom.xml # cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/WarnStrategyCacjeService.java # cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports # cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FenceGroupUpdateReq.java # cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml # 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/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/enterpise-service/src/main/resources/bootstrap.yml # cloud-modules/cloud-modules-parse/pom.xml # cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/process/ProcessData.java		2024-10-07 18:57:20 +08:00
..
cloud-modules-data-process-common	Merge branch 'dev.parse' into dev	2024-10-07 18:57:20 +08:00
cloud-modules-data-process-server	Merge branch 'dev.parse' into dev	2024-10-07 18:57:20 +08:00
pom.xml	fix():修复框架bug	2024-09-29 22:45:06 +08:00