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/MwCollectRecord.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwCollectRecord.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwCollectRecord.java
index 6fb0425..0c3f9a9 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwCollectRecord.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwCollectRecord.java
@@ -85,6 +85,10 @@
@TableField("BOX_TIME")
private Date boxTime;
+ @ApiModelProperty("接收人id")
+ @TableField("RECEIVE_USER_ID")
+ private Long receiveUserId;
+
@ApiModelProperty("收集人id")
@TableField("COLLECT_USER_ID")
private Long collectUserId;
@@ -92,6 +96,31 @@
@ApiModelProperty("收集时间")
@TableField("COLLECT_TIME")
private Date collectTime;
-
+
+ @ApiModelProperty("接收时间")
+ @TableField("RECEIVE_TIME")
+ private Date receiveTime;
+ @ApiModelProperty("司机用户id")
+ @TableField("DRIVER_ID")
+ private Long driverId;
+ @ApiModelProperty("车辆id")
+ @TableField("CAR_ID")
+ private Long carId;
+ @ApiModelProperty("处置时间")
+ @TableField("DISPOSAL_TIME")
+ private Date disposalTime;
+
+ @ApiModelProperty("处置用户ID")
+ @TableField("DISPOSAL_USER_ID")
+ private Long disposalUserId;
+
+ @ApiModelProperty("接收部门id")
+ @TableField("RECEIVE_DEPARTMENT_ID")
+ private Long receiveDepartmentId;
+
+
+
+
+
}
--
Gitblit v1.7.1