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/MonitorListDto.java

@@ -20,7 +20,7 @@ public class MonitorListDto {
     private String deviceLevel;
     private String location;
     private String status;
-
+    private String equImage;
     // 监控指标
     private Float cpuUtilization;
     private String health;

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

@@ -200,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             c.equTypeName,
             c.equManuId,
             c.equManuName,
+            c.equImage,
             c.version,
             c.deviceLevel,
             c.location,
@@ -219,6 +220,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                      t.name AS equTypeName,
                      b.manufacture AS equManuId,
                      m.name AS equManuName,
+                     b.equ_image AS equImage,
                      b.version,
                      b.device_level AS deviceLevel,
                      b.location,