From 9bccc1f1454f934f83a2e0d3b5583b3dbe7fc4f0 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 22 May 2026 17:06:48 +0800
Subject: [PATCH] fix(device): 修复设备查询中子序列号为空的过滤问题
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderVO.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderVO.java
index 70cb6aa..5482126 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdWorkOrderVO.java
@@ -20,6 +20,8 @@
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 工单任务表 视图实体类
@@ -32,6 +34,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 工单名称
@@ -88,6 +91,12 @@
*/
@ApiModelProperty(value = "备注")
private String remark;
+
+ /**
+ * 拒绝原因（审核拒绝时必填）
+ */
+ @ApiModelProperty(value = "拒绝原因（审核拒绝时必填）")
+ private String rejectReason;
/**
* 区域编码
*/
@@ -97,4 +106,25 @@
@ApiModelProperty(value = "需求方名称")
private String createUserName;
+ @ApiModelProperty(value = "创建人")
+ private Long createUser;
+
+ @ApiModelProperty(value = "创建部门")
+ private Long createDept;
+
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新人")
+ private Long updateUser;
+
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "状态")
+ private Integer status;
+
+ @ApiModelProperty(value = "逻辑删除")
+ private Integer isDeleted;
+
}
--
Gitblit v1.9.3