Merge remote-tracking branch 'origin/master'

aijinhui

2024-02-23 0abccf5e570dce53a802bca4ce25118dd900692c

 ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java

@@ -137,4 +137,8 @@
     * 查询油井动静态数据
     */
    Map<String,Object> getWellDataByWellId(String wellId, List<SysConfig> config);

    Map<String,Object> getWellDataByPatrolplanIdAndPosition(Map<String,Object> para,List<SysConfig> sysConfigResult);

    ArdAlarmpointsWell getWellById(String id);
}