From 7b09f233bde70508f6db7e08e983e9a2c4bb3e99 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 11 八月 2023 17:50:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java
index 9d3f22c..a7a296d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java
@@ -21,7 +21,7 @@
     @Transactional(rollbackFor = Exception.class)
     Integer addProcessInspectionSheet(FinishedInspect finishedInspect);
 
-    Integer inspectionConclusion(Integer finishedInspectId, Integer result);
+    Integer inspectionConclusion(String username,Integer finishedInspectId, Integer result);
 
     IPage<Map<String, Object>> selectFinishedInspectPage(Page<Object> page, Integer inspectResult, String inspectDate, String inspectUsername);
 }

--
Gitblit v1.9.3