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

guoshilong

2023-06-06 c7f24dde247a95facd2f8d3659ed9309139d1088

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

@@ -40,4 +40,15 @@
      add("rz");
   }};

   /**
    * 水位初次超汛限告警(水库技术责任人、巡查责任人)
    */
   public static List<String>  waterFirstOverList = new ArrayList<String>()
   {{
      add("town_nm");
      add("res_nm");
      add("rz");
      add("over_z");
   }};

}