From 8429b26635252973e325d020af1a4485a0bbfdb0 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 28 八月 2024 11:26:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZfRelation.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfRelation.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfRelation.java
index a453668..af14ed8 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfRelation.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfRelation.java
@@ -22,7 +22,18 @@
private Long myId;
- private Long otherId;
-
private String relation;
+
+ private String otherName;
+
+ private String otherUnit;
+
+ private String otherPosition;
+
+ private String otherPolitical;
+
+ /**
+ * 鍒嗕韩浜�
+ */
+ private Integer shareId;
}
--
Gitblit v1.9.1