From 476740c4330135b38be6a32f54dbe1bbcd32476a Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期一, 13 一月 2025 13:20:56 +0800 Subject: [PATCH] Merge branch 'master' into cnas --- cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java index e1e034d..4f08b8b 100644 --- a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java +++ b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java @@ -19,7 +19,7 @@ List<User> selectUserList(); - Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter); + Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter,Boolean laboratoryNameIsNull); int addDeviceParameter(Device itemParameter); -- Gitblit v1.9.3