From 24b0b79158fc499f2e2f6b67e169b3b4dff97569 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Sat, 23 Mar 2024 16:58:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/patches/model/PatchesEntity.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/model/PatchesEntity.java b/src/main/java/com/dji/sample/patches/model/PatchesEntity.java
index a32ede2..92eb30b 100644
--- a/src/main/java/com/dji/sample/patches/model/PatchesEntity.java
+++ b/src/main/java/com/dji/sample/patches/model/PatchesEntity.java
@@ -6,9 +6,6 @@
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import org.opengis.geometry.coordinate.Polygon;
-
-
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -59,11 +56,12 @@
private String kzxx;
@TableField("dkfw")
- private Polygon dkfw;
+ private String dkfw;
@TableField("sjlx")
private String sjlx;
+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("create_time")
private LocalDateTime createTime;
--
Gitblit v1.9.3