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

ke

2024-05-13 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38

 skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/AlarmGet.java

@@ -112,4 +112,6 @@
    * 处置状态(1、已处置；2、未处置)
    */
   private String status;

   private String taskId;
}