From 2b776c4a2222d9bc36f53a449bda2b808c7b43b9 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 03 八月 2024 14:38:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 ba79866..dab8936 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
@@ -3,13 +3,15 @@
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+import java.util.Date;
/**
* 杩愮淮鐐逛綅
@@ -31,15 +33,17 @@
@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("杩愮淮鍗曚綅")
@TableField(value = "unit_id", updateStrategy = FieldStrategy.IGNORED)
- private Integer unitId;
+ private Long unitId;
@ApiModelProperty("杩愮淮鐘舵��")
@TableField("status")
@@ -48,15 +52,26 @@
@ApiModelProperty("澶囨敞")
@TableField("remark")
private String remark;
+
@ApiModelProperty("杩愮淮绫诲瀷")
@TableField("category")
private Short category;
+
@ApiModelProperty("涓婃姤閮ㄩ棬")
@TableField("dept_id")
private Long deptId;
- @TableField("point_detail")
- private String pointDetail;
+ @TableField("point_tag")
+ private String pointTag;
+ @TableField("reason")
+ private String reason;
+
+ @TableField("recovery")
+ private Integer recovery;
+
+ @TableField("recovery_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date recoveryTime;
}
--
Gitblit v1.8.0