From 85afea4dc14ca9a8a3fcacc447f269089fc953ad Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 九月 2024 11:09:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
index 18c9545..ec0648d 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -44,6 +45,15 @@
}
return R.ok(data);
}
+ @ApiOperation(value = "标签管理列表", tags = {"用户管理-用户标签管理"})
+ @GetMapping(value = "/tags/select")
+ public R<List<TUserTag>> select() {
+ TagListQueryDto tagListQueryDto = new TagListQueryDto();
+ tagListQueryDto.setPageCurr(1);
+ tagListQueryDto.setPageSize(999);
+ R<Page<TUserTag>> pageR = otherClient.queryTagPage(tagListQueryDto);
+ return R.ok(pageR.getData().getRecords());
+ }
@ApiOperation(value = "标签添加或修改", tags = {"用户管理-用户标签管理"})
--
Gitblit v1.7.1