From 7bdfa197160b01161e417d3aea81e0d3a643e18d Mon Sep 17 00:00:00 2001
From: chenhaojie <hjchencq@isoftstone.com>
Date: Thu, 17 Oct 2024 09:40:59 +0800
Subject: [PATCH] =?UTF-8?q?[301]=20=E8=AE=BE=E5=A4=87=E7=BC=96=E7=A0=81=20?=
 =?UTF-8?q?=E6=B2=A1=E5=81=9A=E5=94=AF=E4=B8=80=E6=80=A7=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=96=B0=E5=A2=9E=E7=9B=B8=E5=90=8C?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=9A=84=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/das/modules/equipment/mapper/SysEquipmentMapper.java    | 2 +-
 .../modules/equipment/service/impl/SysEquipmentServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java b/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java
index 850dd1c2..989ffc85 100644
--- a/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java
+++ b/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java
@@ -34,6 +34,6 @@ public interface SysEquipmentMapper extends BaseMapperPlus<SysEquipment, SysEqui
 
     int queryEquipmentByCode(@Param("code")String code);
 
-    SysEquipment queryEquipmentInfoByCode(@Param("code")String code);
+    SysEquipmentVo queryEquipmentInfoByCode(@Param("code")String code);
 
 }
diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
index b817b378..bdde52c6 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
@@ -83,7 +83,7 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
         SysEquipment sysEquipment = new SysEquipment();
         BeanCopyUtils.copy(sysEquipmentDto, sysEquipment);
         SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY);
-        SysEquipment oldSysEquipment = sysEquipmentMapper.queryEquipmentInfoByCode(sysEquipmentDto.getCode());
+        SysEquipmentVo oldSysEquipment = sysEquipmentMapper.queryEquipmentInfoByCode(sysEquipmentDto.getCode());
         // 判断设备编码是否存在
         if (sysEquipmentMapper.queryEquipmentByCode(sysEquipment.getCode()) > 0) {
             if (!oldSysEquipment.getId().equals(sysEquipmentDto.getId())) {