wyyay 1 rok pred
rodič
commit
078de44b2f

+ 0 - 2
.idea/encodings.xml

@@ -7,7 +7,5 @@
     <file url="file://$PROJECT_DIR$/hazard-admin/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/hazard-sdk/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/hazard-sdk/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
 </project>

+ 1 - 1
business-service/src/main/java/com/ozs/service/entity/CameraUpdateLog.java

@@ -38,7 +38,7 @@ public class CameraUpdateLog implements Serializable {
     /**
      * 相机编码
      */
-    @Excel(name = "相机编码")
+    @Excel(name = "相机编码", width = 30)
     private String cameraCode;
 
     /**

+ 1 - 1
business-service/src/main/resources/mapper/service/CameraUpdateLogMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.ozs.service.mapper.CameraUpdateLogMapper">
-    <resultMap id="CameraDetailResult" type="com.ozs.service.entity.vo.AlarmStatisticDto">
+    <resultMap id="CameraDetailResult" type="com.ozs.service.entity.CameraUpdateLog">
         <id column="id" property="id"/>
         <result column="camera_code" property="cameraCode"/>
         <result column="version_num" property="versionNum"/>