From b03d89e792a34c486f0afeab69e837f85d8cbe16 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期二, 25 三月 2025 15:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/domain/MwCheckoutRecord.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwCheckoutRecord.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwCheckoutRecord.java
index 14c8d8a..bfee3f1 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwCheckoutRecord.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwCheckoutRecord.java
@@ -10,6 +10,7 @@
import lombok.Getter;
import lombok.Setter;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -56,13 +57,21 @@
@TableField("DRIVER_ID")
private Long driverId;
- @ApiModelProperty("司机姓名（冗余）")
- @TableField("DRIVER_NAME")
- private String driverName;
-
@ApiModelProperty("车辆id")
@TableField("CAR_ID")
private Long carId;
+ @ApiModelProperty("箱数")
+ @TableField("BOX_NUM")
+ private Integer boxNum;
+
+ @ApiModelProperty("袋数")
+ @TableField("BAG_NUM")
+ private Integer bagNum;
+
+ @ApiModelProperty("总重量")
+ @TableField("TOTAL_WEIGHT")
+ private BigDecimal totalWeight;
+
}
--
Gitblit v1.7.1