From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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