From 7b5bd819a97e0c9f361e0f71c5c75329770a9291 Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期日, 12 一月 2025 20:55:37 +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/ZfFamily.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java index ff54f44..90e9a4d 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java @@ -35,13 +35,16 @@ /** * 瀹跺涵鍚嶇О */ - @Excel(name="鐖朵翰id") +// @Excel(name="鐖朵翰id") private Long fid; - @Excel(name="姣嶄翰id") +// @Excel(name="姣嶄翰id") private Long mid; + private Integer clanId; + + } -- Gitblit v1.9.1