From 65cdac580fe64d6ef0ce2bd08750e2179222c395 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 03 八月 2024 14:39:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
index 4fd4a81..db2f07a 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
@@ -33,10 +33,12 @@
@ApiModelProperty("鐐逛綅寮�濮嬫椂闂�")
@TableField("start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime startTime;
@ApiModelProperty("鐐逛綅缁撴潫鏃堕棿")
@TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime endTime;
@ApiModelProperty("杩愮淮鍗曚綅")
@@ -62,6 +64,9 @@
@TableField("point_tag")
private String pointTag;
+ @TableField("serial_number")
+ private String serialNumber;
+
@TableField("reason")
private String reason;
@@ -72,4 +77,5 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date recoveryTime;
+
}
--
Gitblit v1.8.0