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 |
||
---|---|---|
.. | ||
src | ||
pom.xml |