Merge branch 'master' into 重构/1078

# Conflicts:
#	web/src/router/index.js
#	web/src/views/common/channelPlayer/chooseChannelForJt.vue
#	web/src/views/common/channelPlayer/jtDeviceEdit.vue
#	web/src/views/common/channelPlayer/jtDevicePlayer.vue
#	web_src/src/layout/UiHeader.vue
#	web_src/src/main.js
#	web_src/src/router/index.js

src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java

@@ -15,7 +15,7 @@ import java.time.temporal.TemporalAccessor;
 
 import java.util.Locale;
 
-/**    
+/**
  * 全局时间工具类
  * @author lin
  */
@@ -74,7 +74,7 @@ public class DateUtil {
 	public static String yyyy_MM_dd_HH_mm_ssToISO8601(@NotNull String formatTime) {
         return formatterISO8601.format(formatter.parse(formatTime));
     }
-	
+
 	public static String ISO8601Toyyyy_MM_dd_HH_mm_ss(String formatTime) {
         // 三种日期格式都尝试，为了兼容不同厂家的日期格式
         if (verification(formatTime, formatterCompatibleISO8601)) {
@@ -211,11 +211,4 @@ public class DateUtil {
         return ChronoUnit.MILLIS.between(startInstant, endInstant);
     }
 
-
-
-    public static void main(String[] args) {
-        long difference = getDifference("2025-05-21 13:00:00", "2025-05-21 13:30:00")/1000;
-        System.out.println(difference);
-    }
-
 }