From b83b070dc8cc823c877aa3a2ade134272ec0641a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 07 七月 2025 17:02:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/lmk/CustomerController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/CustomerController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/CustomerController.java
index 1478a62..4a7a4d2 100644
--- a/buyer-api/src/main/java/cn/lili/controller/lmk/CustomerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/lmk/CustomerController.java
@@ -3,13 +3,13 @@
import cn.lili.base.Result;
import cn.lili.group.Add;
import cn.lili.group.Update;
-import cn.lili.modules.lmk.domain.form.CustomerTagForm;
+import cn.lili.modules.lmk.domain.form.MemberTagForm;
import cn.lili.modules.lmk.domain.form.CustomerTagRefForm;
import cn.lili.modules.lmk.domain.query.CustomerQuery;
import cn.lili.modules.lmk.domain.query.CustomerTagQuery;
import cn.lili.modules.lmk.service.CustomerService;
import cn.lili.modules.lmk.service.CustomerTagRefService;
-import cn.lili.modules.lmk.service.CustomerTagService;
+import cn.lili.modules.lmk.service.MemberTagService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -27,7 +27,7 @@
public class CustomerController {
private final CustomerService customerService;
- private final CustomerTagService customerTagService;
+ private final MemberTagService memberTagService;
private final CustomerTagRefService customerTagRefService;
@ApiOperation(value = "鍟嗛摵涓嬫媺鍒楄〃")
@@ -45,39 +45,39 @@
@PostMapping("/addTag")
@ApiOperation(value = "娣诲姞鏍囩", notes = "娣诲姞鏍囩")
- public Result add(@RequestBody @Validated(Add.class) CustomerTagForm form) {
- return customerTagService.add(form);
+ public Result add(@RequestBody @Validated(Add.class) MemberTagForm form) {
+ return memberTagService.add(form);
}
@PutMapping("/editTag")
@ApiOperation(value = "淇敼鏍囩", notes = "淇敼鏍囩")
- public Result update(@RequestBody @Validated(Update.class) CustomerTagForm form) {
- return customerTagService.update(form);
+ public Result update(@RequestBody @Validated(Update.class) MemberTagForm form) {
+ return memberTagService.update(form);
}
@DeleteMapping("/tag/{id}")
@ApiOperation(value = "ID鍒犻櫎鏍囩", notes = "ID鍒犻櫎")
public Result removeById(@PathVariable("id") String id) {
- return customerTagService.removeById(id);
+ return memberTagService.removeById(id);
}
@GetMapping("/tagList")
@ApiOperation(value = "鏍囩鍒楄〃", notes = "鏍囩鍒楄〃")
public Result list() {
- return customerTagService.all();
+ return memberTagService.all();
}
@GetMapping("/pageTagList")
@ApiOperation(value = "鍒嗛〉鏍囩鍒楄〃", notes = "鏍囩鍒楄〃")
public Result pageList(CustomerTagQuery query) {
- return customerTagService.page(query);
+ return memberTagService.page(query);
}
@PostMapping("/customerAddTag")
@ApiOperation(value = "娣诲姞瀹㈡埛鏍囩鏍囪瘑", notes = "娣诲姞瀹㈡埛鏍囩鏍囪瘑")
- public Result addCustomerTag(@RequestBody @Validated(Add.class) CustomerTagForm form) {
- return customerTagService.addCustomerTag(form);
+ public Result addCustomerTag(@RequestBody @Validated(Add.class) MemberTagForm form) {
+ return memberTagService.addMemberTag(form);
}
// @PostMapping("/customerAddTag")
--
Gitblit v1.8.0