From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java |    4 ++++
 1 files changed, 4 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..0113b67 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
@@ -18,8 +18,12 @@
  */
 public interface DamageService extends MPJBaseService<Damage> {
 
+    List<Damage> selectDamage(String startTime, String endTime, int type, String workingProcedure);
+
     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