From b93a030e667a48e00926d121ff9eb029de72f857 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 06 八月 2024 19:36:23 +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 |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 5dfe4bd..9351669 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfClan.java
@@ -7,13 +7,13 @@
 
 @Data
 @TableName("zf_clan")
-public class clan {
-    @TableId(value = "id", type = IdType.AUTO)
+public class ZfClan {
+    @TableId(value = "clan_id", type = IdType.AUTO)
     private Integer clanId;
 
+    /**
+     * 瀹舵棌鍚嶇О
+     */
     private String clanName;
 
-    private Integer dadId;
-
-    private Integer momId;
-}
+}
\ No newline at end of file

--
Gitblit v1.9.1