From 3222d83845148e2479af6aeb0f029def5f28f8b2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Mar 2024 12:34:53 +0800
Subject: [PATCH] Merge branch 'jc' of http://s16s652780.51mypc.cn:49896/r/zhba_management_w_bf into jc

---
 src/main/java/org/springblade/modules/post/entity/PostFiling.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/post/entity/PostFiling.java b/src/main/java/org/springblade/modules/post/entity/PostFiling.java
index f87f2d4..07b7e19 100644
--- a/src/main/java/org/springblade/modules/post/entity/PostFiling.java
+++ b/src/main/java/org/springblade/modules/post/entity/PostFiling.java
@@ -77,16 +77,19 @@
 	/**
 	 * 上岗时间
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date dutyTime;
+//	@JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
+//	@DateTimeFormat(pattern = "HH:mm")
+	private String dutyTime;
 
 	/**
 	 * 下岗时间
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date layoffTime;
+//	@JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
+//	@DateTimeFormat(pattern = "HH:mm")
+	private String layoffTime;
+
+	//距离，默认50m
+	private Double distance;
 
 
 

--
Gitblit v1.9.3