修改logo和icon

src/main/java/com/sooka/sponest/monitor/camera/domain/VisuForestCloudCameraBO.java

@@ -1,6 +1,7 @@
 package com.sooka.sponest.monitor.camera.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
@@ -64,6 +65,12 @@ public class VisuForestCloudCameraBO extends BaseEntity {
 
     private String cameraFactory;
 
+    /**
+     * 融合平台(海康、大华)
+     */
+    @Excel(name = "融合平台(海康、大华)", readConverterExp = "0=海康平台,1=大华平台")
+    private String convergencePlatform;
+
     /** 所属区域 */
 
     private String cameraRegion;

src/main/resources/mapper/monitor/camera/CentermonitorTCameraMapper.xml

@@ -21,6 +21,7 @@
         <result property="cameraPasword" column="camera_pasword"/>
         <result property="cameraCode" column="camera_code"/>
         <result property="cameraFactory" column="camera_factory"/>
+        <result property="convergencePlatform" column="convergence_platform"/>
         <result property="cameraRegion" column="camera_region"/>
         <result property="cameraRadius" column="camera_radius"/>
         <result property="height" column="height"/>