From 48a4e5b6447d1c17d726e383b540232f51786a75 Mon Sep 17 00:00:00 2001 From: xiaohuo <14141624+dsgfhrh@user.noreply.gitee.com> Date: Wed, 8 Oct 2025 18:48:23 +0800 Subject: [PATCH] =?UTF-8?q?10.8=E5=8E=82=E5=95=86=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/alops/system/domain/vo/queryEquBaseVO.java | 4 ++-- .../src/main/resources/mapper/system/EquBaseMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/queryEquBaseVO.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/queryEquBaseVO.java index c806e4e0..27b97ad0 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/queryEquBaseVO.java +++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/queryEquBaseVO.java @@ -41,7 +41,7 @@ public class queryEquBaseVO { private String ip; /** 设备厂商 */ @Excel(name = "设备厂商名称 ") - private String manuName; + private String manufacture; /** 设备厂商 */ @Excel(name = "设备厂商名称 ") private String supplierName; @@ -230,7 +230,7 @@ public class queryEquBaseVO { .append("version", getVersion()) .append("ip", getIp()) .append("supplierName", getSupplierName()) - .append("manuName", getManuName()) + .append("manuName", getManufacture()) .append("location", getLocation()) .append("equType", getEquType()) .append("inCharge", getInCharge()) diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml index a3860a73..34fad4e3 100644 --- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml +++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml @@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.name AS name, b.version AS version, b.ip AS ip, - m.name AS manuName, + m.name AS manufacture, s.name AS supplierName, b.location AS location, t.name AS equType,