From 8400a67289b214b83a20484410fff96d236c6d49 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 25 Nov 2023 18:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java b/src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java
index 1497e47..f14e686 100644
--- a/src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java
@@ -83,6 +83,6 @@
 	/** 住户id */
 	@ApiModelProperty(value = "住户id", example = "")
 	@TableField("household_id")
-	private Long householdId;
+	private Integer householdId;
 
 }

--
Gitblit v1.9.3