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

rain

2024-07-09 1e0c6ba7f21e273fd14065073920a9b7b9c2cd54

 src/main/java/com/dji/sample/media/model/MediaFileMarkEntity.java

@@ -72,11 +72,14 @@
    @TableField("user_id")
    private String userId;

    @TableField("isadd")
    private Integer isadd;

    @TableField(value = "metadata", typeHandler = FastjsonTypeHandler.class)
    private Object metadata;

    @TableField("isadd")
    private Integer isadd;
    @TableField(value = "drone_data", typeHandler = FastjsonTypeHandler.class)
    private Object dronedata;

}