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
@@ -503,7 +504,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
create_date,
equ_number,
floor,
-
+ brand,
status,
equ_image,
failure_frequency,
@@ -527,6 +528,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{createDate},
#{equNumber},
#{floor},
+ #{brand},
COALESCE(#{status,jdbcType=INTEGER}, 0),
#{equImage},
COALESCE(#{failureFrequency,jdbcType=BIGINT}, 0),
@@ -556,6 +558,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
equ_image = #{equImage},
equ_number = #{equNumber},
floor = #{floor},
+ brand = #{brand},
create_date = create_date
where id = #{id}