From 6fa2119b1396999efce52cd359779f0be4e0e751 Mon Sep 17 00:00:00 2001
From: xiaohuo <14141624+dsgfhrh@user.noreply.gitee.com>
Date: Sat, 1 Nov 2025 15:15:19 +0800
Subject: [PATCH] =?UTF-8?q?11.1=E8=AE=BE=E5=A4=87=E6=A1=A3=E6=A1=88?=
 =?UTF-8?q?=E7=9A=84=E5=93=81=E7=89=8C=E5=9E=8B=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/alops/system/domain/vo/queryEquBaseVO.java    | 2 ++
 .../src/main/resources/mapper/system/EquBaseMapper.xml     | 7 +++++--
 2 files changed, 7 insertions(+), 2 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 9a10c7ea..e429c9b0 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
@@ -102,6 +102,8 @@ public class queryEquBaseVO {
     @Excel(name = "楼层位置")
     private String floor;
 
+    @Excel(name = "品牌型号")
+    private String brand;
 
 
     public void setId(String id)
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 04ce9591..4bc40393 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
@@ -162,7 +162,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     b.device_level AS deviceLevel,
     g.health AS health,
     b.equ_image AS equImage,
-    b.floor AS floor
+    b.floor AS floor,
+    b.brand AS brand
     </sql>
 
 <!--    <select id="selectEquBaseList" parameterType="equBaseQueryDto" resultType="com.alops.system.domain.vo.queryEquBaseVO">-->
@@ -503,7 +504,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createDate != null">create_date,</if>
             <if test="equNumber != null">equ_number,</if>
             <if test="floor != null">floor,</if>
-
+            <if test="brand != null">brand,</if>
             status,
             <if test="equImage != null">equ_image,</if>
             failure_frequency,
@@ -527,6 +528,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createDate != null">#{createDate},</if>
             <if test="equNumber != null">#{equNumber},</if>
             <if test="floor != null">#{floor},</if>
+            <if test="brand != null">#{brand},</if>
             COALESCE(#{status,jdbcType=INTEGER}, 0),
             <if test="equImage != null">#{equImage},</if>
             COALESCE(#{failureFrequency,jdbcType=BIGINT}, 0),
@@ -556,6 +558,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="equImage != null">equ_image = #{equImage},</if>
             <if test="equNumber != null">equ_number = #{equNumber},</if>
             <if test="floor != null">floor = #{floor},</if>
+            <if test="brand != null">brand = #{brand},</if>
             create_date = create_date
         </trim>
         where id = #{id}