From 7f615dc1f37ccc9efd7f5b2f7e044c2e62f01074 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Sat, 14 Sep 2024 14:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java
index 94c1ed0..3c63867 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java
@@ -136,7 +136,7 @@
@PostMapping("add")
public R add(@RequestBody SgProjectInfoDO sgProjectInfoDO) {
sgProjectInfoService.save(sgProjectInfoDO);
- return R.success("新增成功");
+ return R.data(sgProjectInfoDO);
}
/**
@@ -152,8 +152,8 @@
* 项目树
*/
@GetMapping("project_tree")
- public R projectTree() {
- List<SgProjectTreeVO> tree = sgProjectInfoService.projectTree();
+ public R projectTree(ProjectSearchDTO dto) {
+ List<SgProjectTreeVO> tree = sgProjectInfoService.projectTree(dto);
return R.data(tree);
}
}
--
Gitblit v1.9.3