Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev

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)

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">-->
@@ -506,7 +507,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,
@@ -530,6 +531,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),
@@ -559,6 +561,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}