From 9d31915e99fcd5e5fc3b9453eb570fc2358e0179 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 一月 2025 16:48:30 +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/ZfClan.java | 18 +++---------------
1 files changed, 3 insertions(+), 15 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 899a696..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,31 +3,19 @@
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
@TableName("zf_clan")
public class ZfClan {
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "clan_id", type = IdType.AUTO)
private Integer clanId;
/**
* 瀹舵棌鍚嶇О
*/
+ @Excel(name = "鍚嶅瓧")
private String clanName;
- /**
- * 鐖朵翰id
- */
- private Integer dadId;
-
- /**
- * 姣嶄翰id
- */
- private Integer momId;
-
- /**
- * 绠＄悊鍛榠d
- */
- private Integer adminId;
}
\ No newline at end of file
--
Gitblit v1.9.1