Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

aix

2024-09-13 8018e564729067b0b61a5c992b5667dbcad39c70

 skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRuleDetail.java

@@ -43,6 +43,11 @@
   private String templateId;

   /**
    * 模板表ID (合并内容发送模板)
    */
   private String mergeTemplateId;

   /**
    * 备注
    */
   private String alarmRemark;