From 74d1c21ebb6b3b916904d95d13d289df23dcdedd Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 20 Aug 2024 18:06:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/media/model/MediaFileMarkEntity.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/model/MediaFileMarkEntity.java b/src/main/java/com/dji/sample/media/model/MediaFileMarkEntity.java
index c0aee05..5b726e5 100644
--- a/src/main/java/com/dji/sample/media/model/MediaFileMarkEntity.java
+++ b/src/main/java/com/dji/sample/media/model/MediaFileMarkEntity.java
@@ -72,12 +72,12 @@
@TableField("user_id")
private String userId;
- @TableField(value = "metadata", typeHandler = FastjsonTypeHandler.class)
- private Object metadata;
-
@TableField("isadd")
private Integer isadd;
+ @TableField(value = "metadata", typeHandler = FastjsonTypeHandler.class)
+ private Object metadata;
+
@TableField(value = "drone_data", typeHandler = FastjsonTypeHandler.class)
private Object dronedata;
--
Gitblit v1.9.3