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

rain

2024-08-02 7d5e32ab845140711e8c40c7dd1452a9766c68f4

 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;

}