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/controller/HouseLabelController.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/controller/HouseLabelController.java b/src/main/java/org/springblade/modules/house/controller/HouseLabelController.java
index bbe1b9c..cc8545d 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseLabelController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseLabelController.java
@@ -24,7 +24,6 @@
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -139,7 +138,7 @@
 	 */
 	@PostMapping("/removeHouseLabel")
 	@ApiOperationSupport(order = 7)
-	public R remove(@RequestBody HouseLabelEntity houseLabel) {
+	public R removeHouseLabel(@RequestBody HouseLabelEntity houseLabel) {
 		QueryWrapper<HouseLabelEntity> wrapper = new QueryWrapper<>();
 		wrapper.eq("label_id",houseLabel.getLabelId())
 			.eq("house_code",houseLabel.getHouseCode());

--
Gitblit v1.9.3