From a70a81b036cbcd8516ace15f3ae3c57e779d29f5 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Fri, 14 Jun 2024 18:07:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxMapper.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxMapper.java
index cfe876d..dfb9ddb 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxMapper.java
@@ -4,7 +4,9 @@
 import cn.gistack.sm.sg.DO.SgGxStepDO;
 import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
 import cn.gistack.sm.sg.VO.SgGxVO;
+import cn.gistack.system.user.vo.UserVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -19,9 +21,11 @@
  */
 public interface SgGxMapper extends BaseMapper<SgGxDO> {
 
-    List<SgGxVO> queryPageList(@Param("dto") ProjectSearchDTO dto);
+    List<SgGxVO> queryPageList(IPage<SgGxVO> page, @Param("dto") ProjectSearchDTO dto);
 
 	List<SgGxStepDO> queryStepByIds(@Param("ids") List<Long> ids);
 
 	SgGxDO selectByGxType(@Param("gxType") String gxType);
+
+	SgGxVO getById(@Param("id") Long id);
 }

--
Gitblit v1.9.3