From 4ddd3e7456b2afe79cccf7c9f5960ea2023231f1 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 30 Nov 2023 17:49:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java
index e9a12a2..5abce9b 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCompanyEntity.java
@@ -51,6 +51,13 @@
 	private Integer id;
 
 	/**
+	 * 组织机构id
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "组织机构id")
+	private Long deptId;
+
+	/**
 	 * 物业公司名称
 	 */
 	@ApiModelProperty(value = "物业公司名称")

--
Gitblit v1.9.3