From de1823591a01addd54cb1aab4d78397dcb020472 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 07 十月 2024 23:14:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/dto/AncestorClan.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/dto/AncestorClan.java b/zhang-content/src/main/java/com/ruoyi/domain/dto/AncestorClan.java
index 4dd402d..6565bb9 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/dto/AncestorClan.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/dto/AncestorClan.java
@@ -1,15 +1,16 @@
package com.ruoyi.domain.dto;
+import com.ruoyi.common.annotation.Excel;
import com.ruoyi.domain.ZfAncestor;
import lombok.Data;
import java.io.Serializable;
@Data
public class AncestorClan extends ZfAncestor implements Serializable {
-
+ @Excel(name="瀹舵棌鍚嶇О")
private String clanName;
-
+ @Excel(name="绫诲瀷")
private String roleName;
--
Gitblit v1.9.1