From 75aa42c51ae2a63d7c1e5e813c0a88fd303bdbf4 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 03 一月 2025 18:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitee/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CollectDto.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 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
new file mode 100644
index 0000000..29e4edc
--- /dev/null
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CollectDto.java
@@ -0,0 +1,31 @@
+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("箱子编号")
+    private String boxNumber;
+    @ApiModelProperty("医废类型(数据字典id)")
+    private Integer wasteType;
+    @ApiModelProperty("总袋数")
+    private Integer num;
+    @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;
+    private String departmentName;
+
+}

--
Gitblit v1.7.1