From bfe4e6e49ea341c8443d7b4b70cb66de0f1aadab Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 03 Dec 2024 09:53:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.java
index c2c1a0a..a0ba307 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.java
@@ -57,8 +57,10 @@
List<SgProjectTreeVO> projectTree(@Param("dto") ProjectSearchDTO dto);
- List<String> getUserS(String controlUnit);
+ List<String> getUserS(@Param("list") List<String> controlUnit);
+
+ List<ResVO> resList(IPage<ResVO> page, @Param("dto") ProjectSearchDTO dto);
- //List<String> getProjectIds(String code,@Param("grad") String grad );
+ //List<String> getProjectIds(String code,@Param("grad") String grad );
}
--
Gitblit v1.9.3