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

guoshilong

2023-07-05 abaf72a337248943e037b02d069c094e2ee5d60b

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

@@ -51,4 +51,17 @@
      add("over_z");
   }};

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

}