From d5722f787f61e7fb07ab214241476a1aa92ddbe7 Mon Sep 17 00:00:00 2001
From: xiaohuo <14141624+dsgfhrh@user.noreply.gitee.com>
Date: Sat, 1 Nov 2025 15:02:55 +0800
Subject: [PATCH] =?UTF-8?q?11.1=E5=93=81=E7=89=8C=E5=9E=8B=E5=8F=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/alops/system/domain/EquBase.java         | 3 +++
 .../src/main/resources/mapper/system/EquBaseMapper.xml         | 1 +
 2 files changed, 4 insertions(+)

diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java
index 7ba6f50d..7a08654b 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java
@@ -74,6 +74,9 @@ public class EquBase
     @Excel(name = "设备管理员姓名")
     private String inCharge;
 
+    @Excel(name = "品牌型号")
+    private String brand;
+
 
 
 
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 4d162c44..04ce9591 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
@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="equImage"    column="equ_image"    />
         <result property="equNumber"    column="equ_number"    />
         <result property="floor"    column="floor"    />
+        <result property="brand"    column="brand"    />
         <association property="manufactureVO"   columnPrefix="equ_manu_"  autoMapping="true"   />
         <association property="equTypeVO"   columnPrefix="equ_type_"  autoMapping="true"   />