Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-08-05 181164e578bb0412a252c71a16500e6a62258d05

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java

@@ -487,7 +487,7 @@
    */
   public static List<String>  videoOffline = new ArrayList<String>()
   {{
      add("res_nm");
      add("county_nm,town_nm,res_nm");
      add("video_name");
   }};