From a09e361bfcb68a809e9143eca87bed2d66af2216 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Nov 2024 11:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/yw/excel/RescueTeamExcel.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/yw/excel/RescueTeamExcel.java b/src/main/java/org/springblade/modules/yw/excel/RescueTeamExcel.java
index 3c5a558..d064991 100644
--- a/src/main/java/org/springblade/modules/yw/excel/RescueTeamExcel.java
+++ b/src/main/java/org/springblade/modules/yw/excel/RescueTeamExcel.java
@@ -42,4 +42,10 @@
 
 	@ExcelProperty("负责人电话")
 	private String perInChaPho;
+
+	@ExcelProperty("负责人2")
+	private String perInChaTwo;
+
+	@ExcelProperty("负责人电话2")
+	private String perInChaPhoTwo;
 }

--
Gitblit v1.9.3