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

zhaowenyu

2025-11-05 9f3cd3d14b2025c79296ff6cbc49d7efe3302ec5

 ard-device/src/main/java/com/ard/device/camera/domain/ArdCamera.java

@@ -141,6 +141,13 @@
     */
    private Integer chanNo;


    /**
     * 挂载机场ID
     */
    @Excel(name = "挂载机场")
    private Integer dockId;

    @Override
    public int hashCode() {
        return id.hashCode();