From 61e8c8c434a151066413a2a74f068ad4d36977bb Mon Sep 17 00:00:00 2001 From: lhx Date: Wed, 12 Nov 2025 16:48:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=8E=B7=E5=8F=96=E8=AF=95?= =?UTF-8?q?=E9=AA=8C=E5=AE=A4=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dc/dc_project/mapper/LaboratoryMapper.java | 2 +- src/main/java/com/dc/dc_project/model/dto/LaboratoryDto.java | 2 +- src/main/java/com/dc/dc_project/model/vo/LaboratoryVo.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/dc/dc_project/mapper/LaboratoryMapper.java b/src/main/java/com/dc/dc_project/mapper/LaboratoryMapper.java index 2a11be9..e2eeb85 100644 --- a/src/main/java/com/dc/dc_project/mapper/LaboratoryMapper.java +++ b/src/main/java/com/dc/dc_project/mapper/LaboratoryMapper.java @@ -13,7 +13,7 @@ import java.util.List; */ public interface LaboratoryMapper extends BaseMapper { - List getList(Long id, String name, int type, Long standardId); + List getList(Long id, String name, Integer type, Long standardId); List getCategoryIds(Long id); } diff --git a/src/main/java/com/dc/dc_project/model/dto/LaboratoryDto.java b/src/main/java/com/dc/dc_project/model/dto/LaboratoryDto.java index 4f55a67..ad51fad 100644 --- a/src/main/java/com/dc/dc_project/model/dto/LaboratoryDto.java +++ b/src/main/java/com/dc/dc_project/model/dto/LaboratoryDto.java @@ -19,7 +19,7 @@ public class LaboratoryDto{ /** * 实验室类型 */ - private int type; + private Integer type; /** * 行业 diff --git a/src/main/java/com/dc/dc_project/model/vo/LaboratoryVo.java b/src/main/java/com/dc/dc_project/model/vo/LaboratoryVo.java index 55e6248..9024625 100644 --- a/src/main/java/com/dc/dc_project/model/vo/LaboratoryVo.java +++ b/src/main/java/com/dc/dc_project/model/vo/LaboratoryVo.java @@ -59,6 +59,7 @@ public class LaboratoryVo { public static LaboratoryVo getLaboratoryVo(Laboratory laboratory){ LaboratoryVo laboratoryVo = new LaboratoryVo(); laboratoryVo.setId(laboratory.getId()); + laboratoryVo.setName(laboratory.getName()); laboratoryVo.setCoordinateA(laboratory.getCoordinateA()); laboratoryVo.setCoordinateB(laboratory.getCoordinateB()); laboratoryVo.setOrgId(laboratory.getOrgId());