From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理:辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单:标签打印功能调整 3.人员:培训计划导入导出添加【培训大类】字段 4.业务管理:报检新增【物料属性】字段选择,其余页面添加【物料属性】查询条件以及数据回显

---
 cnas-device/src/main/java/com/ruoyi/device/service/DeviceInstructionService.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceInstructionService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceInstructionService.java
index 70e5f1c..7932e3c 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceInstructionService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceInstructionService.java
@@ -7,17 +7,19 @@
 import com.ruoyi.device.dto.DeviceOperationInstructionDto;
 import com.ruoyi.device.pojo.DeviceInstruction;
 
+import java.util.Map;
+
 /**
  * <p>
  * 浣滀笟鎸囧涔︽坊鍔犲彈鎺ф枃浠惰〃 鏈嶅姟绫�
  * </p>
  *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
  * @since 2024-12-04 10:29:18
  */
 public interface DeviceInstructionService extends IService<DeviceInstruction> {
 
-    IPage<DeviceInstruction> pageByPageQueryOfHomeworkInstructions(Page page, DeviceOperationInstructionDto operationInstructionDto);
+    IPage<DeviceOperationInstructionDto> pageByPageQueryOfHomeworkInstructions(Page page, DeviceOperationInstructionDto operationInstructionDto);
 
     void newHomeworkGuidebookAdded(DeviceInstructionDto instructionDto);
 }

--
Gitblit v1.9.3