From 817a1c3860032705a9510fa26371d50cde073f1c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 19 十二月 2024 11:38:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
index d8ddacb..4e5ec39 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
@@ -20,6 +20,8 @@
 
     List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);
 
+//    List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);
+
     void submitDamage(List<Damage> damageList);
 
     Boolean submitReport(Damage damage);

--
Gitblit v1.8.0