From 589ff1b4b598f2f763eb421da960d5550e719144 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 16 Aug 2024 16:38:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev

---
 src/main/java/com/dji/sample/media/model/MediaFileEntity.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/dji/sample/media/model/MediaFileEntity.java b/src/main/java/com/dji/sample/media/model/MediaFileEntity.java
index 5364830..133eb12 100644
--- a/src/main/java/com/dji/sample/media/model/MediaFileEntity.java
+++ b/src/main/java/com/dji/sample/media/model/MediaFileEntity.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -74,6 +75,7 @@
     private String userId;
 
     @TableField(value = "metadata", typeHandler = FastjsonTypeHandler.class)
+    @JsonFormat
     private Object metadata;
 
     @TableField("examine")
@@ -85,5 +87,8 @@
     @TableField(value = "drone_data", typeHandler = FastjsonTypeHandler.class)
     private Object droneData;
 
+    @TableField("isadd")
+    private Integer isadd;
+
 }
 

--
Gitblit v1.9.3