From ae536b434f6eae2a64b4ce30cd8def726ff05a0a Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 22 六月 2025 22:47:02 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

---
 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