From ce56ee73b3a280e9ccbc7258a1402dbaaf3ec4c5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Sep 2021 15:33:54 +0800
Subject: [PATCH] 1.装备导入修改,新增数量,模板示例 2.用户查询接口修改

---
 src/main/java/org/springblade/modules/equipage/excel/EquipageExcel.java |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/equipage/excel/EquipageExcel.java b/src/main/java/org/springblade/modules/equipage/excel/EquipageExcel.java
index e7995ce..b3220e7 100644
--- a/src/main/java/org/springblade/modules/equipage/excel/EquipageExcel.java
+++ b/src/main/java/org/springblade/modules/equipage/excel/EquipageExcel.java
@@ -22,6 +22,7 @@
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * EquipageExcel 保安公司装备
@@ -70,6 +71,14 @@
 	@ExcelProperty("型号")
 	private String mode;
 
+
+	/**
+	 * 数量
+	 */
+	@ColumnWidth(10)
+	@ExcelProperty("数量")
+	private Integer num;
+
 	/**
 	 * 责任人
 	 */
@@ -78,12 +87,12 @@
 	private String personInCharge;
 
 
-	/**
-	 * 责任人
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("责任人身份证号码")
-	private String idCardNo;
+//	/**
+//	 * 责任人
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("责任人身份证号码")
+//	private String idCardNo;
 
 	/**
 	 * 品牌,厂商
@@ -93,4 +102,12 @@
 	private String brand;
 
 
+	/**
+	 * 出厂日期
+	 */
+	@ColumnWidth(25)
+	@ExcelProperty("出厂日期")
+	private String dateForProduction;
+
+
 }

--
Gitblit v1.9.3