From 8018e564729067b0b61a5c992b5667dbcad39c70 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Fri, 13 Sep 2024 23:12:15 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager 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