Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-15 2dc82639ec241aa69f75f7fa6dce5df4942a5665

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

@@ -74,7 +74,11 @@
    @Excel(name = "光电类型")
    private String gdtype;


    /**
     * 厂商
     */
    @Excel(name = "厂商")
    private String factory;

    /**
     * 经度