From cf49f4f936a11b27de3f9ec3cbb50603f3b1cd5b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 28 十二月 2024 16:16:18 +0800
Subject: [PATCH] merge
---
medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCheckoutRecordVO.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCheckoutRecordVO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCheckoutRecordVO.java
index fca8be8..8883818 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCheckoutRecordVO.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCheckoutRecordVO.java
@@ -1,6 +1,6 @@
package com.sinata.system.domain.vo;
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,6 +23,7 @@
private Long id;
@ApiModelProperty("出库时间")
+ @ExcelProperty(value = "出库时间", index = 1)
private Date checkoutTime;
@ApiModelProperty("区域id")
@@ -33,24 +34,34 @@
private String hospitalName;
@ApiModelProperty("暂存间名称")
+ @ExcelProperty(value = "暂存间", index = 3)
private String roomName;
@ApiModelProperty("箱数")
+ @ExcelProperty(value = "箱数", index = 4)
private Integer boxNum;
@ApiModelProperty("袋数")
+ @ExcelProperty(value = "袋数", index = 5)
private Integer bagNum;
@ApiModelProperty("总重量")
+ @ExcelProperty(value = "总重量", index = 6)
private BigDecimal totalWeight;
@ApiModelProperty("医院签名")
+ @ExcelProperty(value = "医院签名", index = 7)
private String hospitalSignature;
@ApiModelProperty("司机姓名")
+ @ExcelProperty(value = "司机姓名", index = 8)
private String driverName;
@ApiModelProperty("车牌号")
+ @ExcelProperty(value = "车牌号", index = 9)
private String licensePlateNumber;
+ @ApiModelProperty("转运线路")
+ private String routeName;
+
}
--
Gitblit v1.7.1