Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-14 0306d5836a7a56614e01af35b9e70f0224b47cb2

 ard-work/src/main/java/com/ruoyi/alarm/global/domain/GlobalAlarmCondition.java

@@ -24,4 +24,6 @@
    String id;
    Date beginTime;
    Date endTime;
    String refreshTime;

}