From dd60bcc7b38c2a19c02a20550a393987fc5a5a27 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期三, 07 八月 2024 16:26:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/WorkAssignmentService.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/WorkAssignmentService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/WorkAssignmentService.java index 3571fe6..c4daba8 100644 --- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/WorkAssignmentService.java +++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/WorkAssignmentService.java @@ -3,6 +3,8 @@ import com.mes.work_assignment.entity.WorkAssignment; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * <p> * 鏈嶅姟绫� @@ -13,5 +15,5 @@ */ public interface WorkAssignmentService extends IService<WorkAssignment> { - WorkAssignment selectWorkAssignment(int line, String workingProcedure); + List<WorkAssignment> selectWorkAssignment(String line, String workingProcedure); } -- Gitblit v1.8.0