From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 14:24:50 +0800
Subject: [PATCH] 1、git同步冲突引起文件丢失，进行系统恢复，并屏蔽一个非git提交的模块； 2、增加文件《增加一个单位（orgTag）》。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoInspect.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoInspect.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoInspect.java
index 4e5ff81..e4656f8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoInspect.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoInspect.java
@@ -3,8 +3,12 @@
import com.dy.common.po.BaseEntity;
import com.dy.pipIrrGlobal.pojoOp.OpeTrack;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
+import java.util.Date;
import java.util.List;
/**
@@ -14,12 +18,14 @@
* @Description
*/
@Data
+@JsonPropertyOrder({"inspectorId", "inspectorName", "inspectId", "startTime", "stopTime", "inspectDistance", "tracks"})
public class VoInspect implements BaseEntity {
private static final long serialVersionUID = 202411201537001L;
/**
* 宸℃鍛業D
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long inspectorId;
/**
@@ -30,19 +36,26 @@
/**
* 宸℃ID
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long inspectId;
/**
* 寮�濮嬪贰妫�鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Data startTime;
+ private Date startTime;
/**
* 缁撴潫宸℃鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Data stopTime;
+ private Date stopTime;
+
/**
* 鍚勪釜宸℃鐐�
*/
private List<OpeTrack> tracks;
+
+ /**
+ * 宸℃璺濈
+ */
+ private Double inspectDistance;
}
--
Gitblit v1.8.0