From f086664481f69eda8a5dd30747b3ed7cb496b9ba Mon Sep 17 00:00:00 2001 From: Calvin <2440603509@qq.com> Date: 星期三, 31 七月 2024 09:53:48 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after --- cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java index 8635854..597c683 100644 --- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java +++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java @@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 璁惧(Device)琛ㄦ暟鎹簱璁块棶灞� @@ -33,6 +34,8 @@ IPage<DeviceDto> selectDeviceParameterPage(Page page, @Param("ew") QueryWrapper<DeviceDto> queryWrappers); - List<String> getInspectionItemSubclass(@Param("id") Integer id); + List<Map<String, Object>> getInspectionItemSubclass(@Param("id") Integer id); + + List<Map<String, Object>> treeDevice(@Param("deviceName") String deviceName); } -- Gitblit v1.9.3