yuqh 22defdd0a2 Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuqh ... Conflicts: buildpackage/pom.xml service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/IIntegrationTaskLivingDetailsDao.java service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/dao/impl/IntegrationTaskLivingDetailsDaoImpl.java service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/entity/IntegrationTaskLogEntity.xml service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/IIntegrationTaskLogService.java service/src/main/java/com/hzya/frame/sysnew/integtationTaskLog/service/impl/IntegrationTaskLogServiceImpl.java		2024-05-15 14:17:09 +08:00
..
main	Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuqh	2024-05-15 14:17:09 +08:00
test/java/com/hzya/frame	澳星档案新增	2024-04-25 13:39:17 +08:00