From d523a67dd8e2a9dbc1cdd25b40ec2ae8497f0750 Mon Sep 17 00:00:00 2001
From: zqy <252236926@qq.com>
Date: 星期一, 09 六月 2025 17:06:54 +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 |    4 ++--
 1 files changed, 2 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 38025f6..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,11 +35,11 @@
     /**
      * 瀹跺涵鍚嶇О
      */
-    @Excel(name="鐖朵翰id")
+//    @Excel(name="鐖朵翰id")
 
     private Long fid;
 
-    @Excel(name="姣嶄翰id")
+//    @Excel(name="姣嶄翰id")
     private Long mid;
 
 

--
Gitblit v1.9.1