From 84f28e6743089c1147e078763de6eafe52d0dc31 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 12 二月 2025 14:15:40 +0800 Subject: [PATCH] 解决冲突 --- medicalWaste-system/src/main/java/com/sinata/system/domain/MwDisposalHandleRecord.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwDisposalHandleRecord.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwDisposalHandleRecord.java index 7d895b3..1eb01d4 100644 --- a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwDisposalHandleRecord.java +++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwDisposalHandleRecord.java @@ -47,6 +47,12 @@ @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