From bacec153f688bcee10795bd38f61b2406c20e488 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 24 九月 2024 16:35:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java index 29124e4..06f0801 100644 --- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java +++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java @@ -51,6 +51,11 @@ @Resource WorkAssignmentMapper workAssignmentMapper; + @Override + public List<Damage> selectDamage(String startTime, String endTime, int type, String workingProcedure) { + return null; + } + /** * 鏌ヨ鎶ュ伐淇℃伅 */ -- Gitblit v1.8.0