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

rain

2024-08-02 7d5e32ab845140711e8c40c7dd1452a9766c68f4

 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;


}