From 555ff988376b8650455547d0b6ff7f12f4ae2c63 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期三, 26 三月 2025 17:27:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwTransitRecordVO.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwTransitRecordVO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwTransitRecordVO.java
index 9699519..71ef292 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwTransitRecordVO.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwTransitRecordVO.java
@@ -1,8 +1,10 @@
package com.sinata.system.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
@@ -17,6 +19,9 @@
@ApiModelProperty("路线id")
private Long id;
+
+ @ApiModelProperty("路线id")
+ private Long carId;
@ApiModelProperty("单位名称")
private String departmentName;
@@ -41,4 +46,9 @@
@ApiModelProperty("状态 1：暂存中; 2：运输中; 3：已接收; 4：已处置;")
private Integer status;
+
+ @ApiModelProperty(value = "运输日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date transitDate;
}
--
Gitblit v1.7.1