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

rain

2024-07-26 56cf48282b9fa39637fdcad9b445d2a2f81a61d9

 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;


}