From f2d0713c2b20a6c751399e2468996eafb8812988 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 18 Apr 2024 10:37:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/excel/UserExcel.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/excel/UserExcel.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/excel/UserExcel.java
index 6e14e29..5971905 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/excel/UserExcel.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/excel/UserExcel.java
@@ -94,4 +94,8 @@
 	@ExcelProperty("生日")
 	private Date birthday;
 
+	@ColumnWidth(20)
+	@ExcelProperty("类型(堤防/水库)")
+	private String type;
+
 }

--
Gitblit v1.9.3