From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java b/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
index ff36524..65c621b 100644
--- a/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
@@ -57,9 +57,9 @@
@ApiModelProperty(value = "角色")
private Integer roleType;
/**
- * 与角色关系
+ * 与业主关系
*/
- @ApiModelProperty(value = "与角色关系")
+ @ApiModelProperty(value = "与业主关系")
private Integer relationship;
/**
@@ -283,4 +283,9 @@
@ApiModelProperty("出租屋id")
private Long housingRentalId;
+ /** 自愿者组织 */
+ @ApiModelProperty(value = "自愿者组织", example = "")
+ @TableField("volunteer_org")
+ private String volunteerOrg;
+
}
--
Gitblit v1.9.3