From 8429b26635252973e325d020af1a4485a0bbfdb0 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 28 八月 2024 11:26:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java
index 9351669..473a64e 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
import lombok.Data;
@Data
@@ -14,6 +15,7 @@
/**
* 瀹舵棌鍚嶇О
*/
+ @Excel(name = "鍚嶅瓧")
private String clanName;
}
\ No newline at end of file
--
Gitblit v1.9.1