From bc679a9077a7ede5b61349645cbb5f411d703949 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 19 八月 2025 19:43:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java
index c06f6c4..aa42319 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java
@@ -19,8 +19,8 @@
/**
* 绫诲埆
*/
-// @Excel(name = "绫诲埆")
-// private String type;
+ @Excel(name = "绫诲埆")
+ private String type;
/**
* 鑾峰緱鏃堕棿
*/
--
Gitblit v1.9.1