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

aijinhui

2024-03-26 493caef7413992d0215b9c2e2bcedd30471d89e7

 ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java

@@ -79,5 +79,8 @@
     * 雷达ID
     */
    private String radarId;

    /**
     * 井号
     */
    private String wellId;
}