From 638408723ebbf884f59ecaafcaab1c29f69bc689 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 15 Jul 2024 16:58:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/manage/model/entity/DeviceSetEntity.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/model/entity/DeviceSetEntity.java b/src/main/java/com/dji/sample/manage/model/entity/DeviceSetEntity.java
index 6dd9566..630e216 100644
--- a/src/main/java/com/dji/sample/manage/model/entity/DeviceSetEntity.java
+++ b/src/main/java/com/dji/sample/manage/model/entity/DeviceSetEntity.java
@@ -43,11 +43,10 @@
@TableField(value = "gbServer_id")
private String gbServerId;
- @TableField(value = "device_id")
- private String deviceId;
+ @TableField(value = "device_name")
+ private String deviceName;
@TableField(value = "workspace_id")
private String workspaceId;
-
}
--
Gitblit v1.9.3