From 62f930cee9ef7031421890cd2c9b636f10ef727a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 20 Nov 2025 10:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-device/src/main/java/com/ard/device/camera/domain/ArdCamera.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ard-device/src/main/java/com/ard/device/camera/domain/ArdCamera.java b/ard-device/src/main/java/com/ard/device/camera/domain/ArdCamera.java
index 317f995..135810d 100644
--- a/ard-device/src/main/java/com/ard/device/camera/domain/ArdCamera.java
+++ b/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();
--
Gitblit v1.9.3