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/dto/MonitorLastDto.java

@@ -28,6 +28,7 @@ public class MonitorLastDto {
     private Date installDate;
     private String inCharge;
     private String status;
+    private String brand;
 
     private int warranty;
     private String equImage;

ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/MonitorListDto.java

@@ -26,6 +26,7 @@ public class MonitorListDto {
     private String health;
     private int fanSpeed;
     private String contWorkPeriod;
+    private String brand;
 
     private int AlertCount;;
     private int unhandledAlertCount;

ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml

@@ -260,6 +260,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             c.health,
             c.fanSpeed,
             c.contWorkPeriod,
+            c.brand,
             c.unhandledAlertCount,
             c.AlertCount
         FROM (
@@ -280,6 +281,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                      g.health,
                      g.fan_speed AS fanSpeed,
                      g.cont_work_period AS contWorkPeriod,
+                     b.brand,
                      (SELECT COUNT(1)
                       FROM alert_message a
                       WHERE a.equ_id = b.id AND a.status = 'UNHANDLED') AS unhandledAlertCount,
@@ -352,6 +354,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.equ_type as equTypeId,
             t.name as equTypeName,
             b.status,
+            b.brand,
 
             b.manufacture as equManuId,
             m.name as equManuName,