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

aix

2024-07-30 249d316e0b8c79b71b779b5716bc488e1d08a9b3

 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;


}