Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

.idea/encodings.xml

@@ -7,5 +7,7 @@
     <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>

business-service/src/main/java/com/ozs/service/entity/BaseCameraManagement.java

@@ -41,7 +41,6 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     @Excel(name = "监控相机安装里程位置(单位KM)")
     private String installMiles;
 
-
     /**
      *线路名称
      */
@@ -49,7 +48,6 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     @Excel(name = "线路名称")
     private String railwayName;
 
-
     /**
      *所属工务段名称
      */
@@ -112,8 +110,6 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      */
     private Long deptId;
 
-   
-
     /**
      * 监控相机安装里程位置
      */
@@ -128,7 +124,6 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 监控范围结束里程位置
      */
     private Integer endMile;
-    
 
     /**
      * 线路编码
@@ -159,21 +154,21 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     /**
      * 版本号
      */
+    @Excel(name = "版本号")
     private String versionNum;
 
     /**
      * 版本名称
      */
+    @Excel(name = "版本名称")
     private String versionName;
 
     /**
      * 上一版本号
      */
+    @Excel(name = "上一版本号")
     private String lastVersionNum;
 
-    
-
-
     /**
      * 详情监控相机安装里程位置字符串形式
      */
@@ -186,10 +181,6 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private String begins;
 
-    
-    
-    
-
     /**
      *是否显示启用录像按钮(1显示2不显示)
      */

hazard-admin/src/main/resources/logback.xml

@@ -2,7 +2,7 @@
 <configuration>
     <!-- 日志存放路径 -->
     <property name="log.path" value="/data/service/hazard-admin/logs"/>
-    <!--  <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/project/logs"/>-->
+<!--      <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/project/logs"/>-->
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>