From f6fad9857bddebb5bfaad2074e4be73b9b5abc62 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 04 Dec 2023 17:34:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jc' into jc

---
 src/main/java/org/springblade/modules/equipage/excel/GunExcel.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/equipage/excel/GunExcel.java b/src/main/java/org/springblade/modules/equipage/excel/GunExcel.java
index 4cec200..12f1087 100644
--- a/src/main/java/org/springblade/modules/equipage/excel/GunExcel.java
+++ b/src/main/java/org/springblade/modules/equipage/excel/GunExcel.java
@@ -81,6 +81,14 @@
 
 
 	/**
+	 * 责任人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("责任人身份证号码")
+	private String cardNo;
+
+
+	/**
 	 * 枪型
 	 */
 	@ColumnWidth(10)

--
Gitblit v1.9.3