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

aijinhui

2024-04-15 dae6e068207ad1bff32dafd8c71f12d8a2a59aa2

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

@@ -103,6 +103,9 @@
     * 雷达ID
     */
    private String radarId;

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

}