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

aix

2024-07-30 259b893309f8c06a22adc8455f44bcc486d796c7

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

@@ -72,6 +72,9 @@
    @TableField("user_id")
    private String userId;

    @TableField("isadd")
    private Integer isadd;

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