From 05628d269dff7ad4f2e9d3419b05b4e7e5768797 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期三, 12 二月 2025 14:19:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CheckOutDto.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CheckOutDto.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CheckOutDto.java
index dd28c65..95df9b3 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CheckOutDto.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CheckOutDto.java
@@ -1,6 +1,7 @@
 package com.sinata.system.domain.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.sinata.system.domain.MwCheckoutRecord;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,7 +14,8 @@
 
     @ApiModelProperty("运输人员姓名")
     private String driverName;
-    @ApiModelProperty("出库时间")
+    @ApiModelProperty("出库时间/接收时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date checkoutTime;
     @ApiModelProperty("车牌号")
     private String licensePlateNumber;

--
Gitblit v1.7.1