From fb798e4982a392408b3e8324c69baba0824fe3fd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 03 Nov 2023 13:44:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/controller/HouseholdLabelController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseholdLabelController.java b/src/main/java/org/springblade/modules/house/controller/HouseholdLabelController.java
index 3a9e7b7..25db840 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseholdLabelController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseholdLabelController.java
@@ -28,6 +28,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.house.entity.HouseLabelEntity;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.house.entity.HouseholdLabelEntity;
@@ -113,6 +114,17 @@
}
/**
+ * 住户-标签 自定义新增或修改
+ * @param householdLabel
+ * @return
+ */
+ @PostMapping("/saveOrUpdateHouseholdLabel")
+ @ApiOperation(value = "自定义新增或修改", notes = "传入householdLabel")
+ public R saveOrUpdateHouseholdLabel(@Valid @RequestBody HouseholdLabelEntity householdLabel) {
+ return R.status(householdLabelService.saveOrUpdateHouseholdLabel(householdLabel));
+ }
+
+ /**
* 住户-标签 删除
*/
@PostMapping("/remove")
--
Gitblit v1.9.3