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/MwDisposalRecord.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwDisposalRecord.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwDisposalRecord.java
index ab47a83..92a67e2 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwDisposalRecord.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwDisposalRecord.java
@@ -24,12 +24,12 @@
 @Getter
 @Setter
 @TableName("MW_DISPOSAL_RECORD")
-@ApiModel(value = "MwDisposalRecord对象", description = "处置接收记录")
+@ApiModel(value = "MwDisposalRecord对象", description = "接收记录")
 public class MwDisposalRecord extends BaseModel {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("处置接收记录id")
+    @ApiModelProperty("接收记录id")
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
@@ -37,7 +37,7 @@
     @TableField("DEPARTMENT_ID")
     private Long departmentId;
 
-    @ApiModelProperty("处置单位名称")
+    @ApiModelProperty("接收单位名称")
     @TableField("DISPOSAL_UNIT_NAME")
     private String disposalUnitName;
 
@@ -84,6 +84,13 @@
     @ApiModelProperty("处置人id")
     @TableField("DISPOSAL_USER_ID")
     private Long disposalUserId;
+    @ApiModelProperty("司机用户id")
+    @TableField("DRIVER_ID")
+    private Long driverId;
+    @ApiModelProperty("车辆id")
+    @TableField("CAR_ID")
+    private Long carId;
+
 
 
 }

--
Gitblit v1.7.1