From 51f460f3b1a8b9fa365e4195c41bb9c5e16fcb7c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 02 一月 2025 10:55:24 +0800
Subject: [PATCH] merge
---
medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CollectDto.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CollectDto.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CollectDto.java
index e058b81..afdbb77 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CollectDto.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CollectDto.java
@@ -1,11 +1,14 @@
package com.sinata.system.domain.dto;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.Date;
+
@Data
public class CollectDto {
@ApiModelProperty("箱子编号")
@@ -17,6 +20,11 @@
@ApiModelProperty("总重量")
private BigDecimal weight;
@ApiModelProperty("封箱时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime lastTime;
+ @ApiModelProperty("接收时间")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date receiveTime;
+ private String wasteTypeStr;
}
--
Gitblit v1.7.1