Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-15 2dc82639ec241aa69f75f7fa6dce5df4942a5665

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

@@ -20,8 +20,6 @@
    String alarmId;
    String alarmType;
    Date receiveTime;
    Integer num;
    Integer recordSn;
    double[] targetPosition;
    GuidePTZ guidePTZ;
}