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

guoshilong

2023-12-09 ba38e73ef30424f4110fcee67a0d7627b08d931e

 skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRecordVO.java

@@ -80,4 +80,9 @@
    * 乡镇
    */
   private String townName;

   /**
    * adCode
    */
   private String adCode;
}