Merge remote-tracking branch 'origin/master'

aijinhui

2023-09-26 f6d7a3f65aea500a275fa5f3f4325730bff16ade

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

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

}