From 19ef4ca4f7252c34fe2e2a03b8868fc997ddd86f Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期五, 13 九月 2024 08:37:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/controller/admin/IndDataSetFieldController.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/controller/admin/IndDataSetFieldController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/controller/admin/IndDataSetFieldController.java
index 2794647..cb1897e 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/controller/admin/IndDataSetFieldController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/data/controller/admin/IndDataSetFieldController.java
@@ -25,7 +25,7 @@
  */
 @Tag(name = "数据平台 - 指标数据集字段")
 @RestController
-@RequestMapping("/data/ind-data-set-field")
+@RequestMapping("/data/ind/data-set-field")
 @Validated
 public class IndDataSetFieldController {
 
@@ -35,9 +35,9 @@
     @GetMapping("/page")
     @Operation(summary = "获取指标数据集字段列表", description = "用于【指标数据集字段】界面")
     @PreAuthorize("@ss.hasPermission('data:ind-data-set:query')")
-    public CommonResult<PageResult<IndDataSetRespVO>> page(IndDataSetFieldPageReqVO reqVO) {
+    public CommonResult<PageResult<IndDataSetFieldRespVO>> page(IndDataSetFieldPageReqVO reqVO) {
         PageResult<IndDataSetFieldEntity> page = indDataSetFieldService.page(reqVO);
-        return success(BeanUtils.toBean(page, IndDataSetRespVO.class));
+        return success(BeanUtils.toBean(page, IndDataSetFieldRespVO.class));
     }
 
     @PostMapping("/create")
@@ -58,7 +58,7 @@
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除指标数据集字段")
-    @Parameter(name = "id", description = "指标数据集字段编号", required= true, example = "1024")
+    @Parameter(name = "id", description = "指标数据集字段编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('data:ind-data-set:delete')")
     public CommonResult<Boolean> delete(@RequestParam("id") String id) {
         indDataSetFieldService.delete(id);
@@ -68,8 +68,8 @@
     @GetMapping("/get")
     @Operation(summary = "获取指标数据集字段信息")
     @PreAuthorize("@ss.hasPermission('system:ind-data-set:query')")
-    public CommonResult<IndDataSetRespVO> get(String id) {
+    public CommonResult<IndDataSetFieldRespVO> get(String id) {
         IndDataSetFieldEntity entity = indDataSetFieldService.get(id);
-        return success(BeanUtils.toBean(entity, IndDataSetRespVO.class));
+        return success(BeanUtils.toBean(entity, IndDataSetFieldRespVO.class));
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3