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

aijinhui

2024-03-23 a70d0dfe221e06381b6e290d1dab85c9ab4fdc31

 ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java

@@ -38,7 +38,7 @@
    Map<String, Double> ptzMap;

    /*目标经纬度*/
    GuidePoint targetPosition;
    double[]  targetPosition;
    /*目标井*/
    String wellId;