From f6fad9857bddebb5bfaad2074e4be73b9b5abc62 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 04 Dec 2023 17:34:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jc' into jc

---
 src/main/java/org/springblade/modules/friend/entity/Friend.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/friend/entity/Friend.java b/src/main/java/org/springblade/modules/friend/entity/Friend.java
index 65e9e39..19e28f3 100644
--- a/src/main/java/org/springblade/modules/friend/entity/Friend.java
+++ b/src/main/java/org/springblade/modules/friend/entity/Friend.java
@@ -69,4 +69,10 @@
 	@ApiModelProperty(value = "申请状态")
 	private String type;
 
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String bz;
+
 }

--
Gitblit v1.9.3