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/MwStagingRoom.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwStagingRoom.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwStagingRoom.java
index a690de6..864f5f9 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwStagingRoom.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwStagingRoom.java
@@ -4,11 +4,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.sinata.common.entity.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+
+import java.util.Date;
/**
* <p>
@@ -46,4 +49,13 @@
@TableField("RELATION")
private String relation;
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("最后装箱时间")
+ private Date boxTime;
+
+ @TableField(exist = false)
+ @ApiModelProperty("当前已装箱")
+ private Long count;
+
}
--
Gitblit v1.7.1