From 2636fff845e9460ca35abb20e7a22d34fb4f39a3 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 22 Jan 2026 11:23:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
index 897633e..73a97b2 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
@@ -16,13 +16,8 @@
*/
package org.sxkj.gd.workorder.vo;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
import java.util.Date;
/**
@@ -104,32 +99,25 @@
@ApiModelProperty("主键id")
private Long id;
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("创建人")
+ @ApiModelProperty(value = "创建人")
private Long createUser;
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("创建部门")
+ @ApiModelProperty(value = "创建部门")
private Long createDept;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("创建时间")
+ @ApiModelProperty(value = "创建时间")
private Date createTime;
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("更新人")
+ @ApiModelProperty(value = "更新人")
private Long updateUser;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("更新时间")
+ @ApiModelProperty(value = "更新时间")
private Date updateTime;
- @ApiModelProperty("业务状态")
+ @ApiModelProperty(value = "状态")
private Integer status;
- @ApiModelProperty("是否已删除")
+ @ApiModelProperty(value = "逻辑删除")
private Integer isDeleted;
}
--
Gitblit v1.9.3