From f142d48409503dfd6b11d7d414c0ee7ffa85eed5 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 28 Aug 2024 14:28:04 +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 |    3 ++-
 1 files changed, 2 insertions(+), 1 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 29ca58a..ed1070d 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
@@ -9,6 +9,7 @@
 import cn.gistack.sm.sg.excel.ProjectExcel;
 import cn.gistack.sm.sg.excel.ProjectImport;
 import cn.gistack.sm.sg.service.SgProjectInfoService;
+import cn.gistack.sm.sjztmd.entity.AttResBase;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiOperation;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -44,7 +45,7 @@
 		Query query = new Query();
 		query.setCurrent(searchDTO.getCurrent());
 		query.setSize(searchDTO.getSize());
-		IPage<SgProjectInfoDO> page = sgProjectInfoService.queryPageList(Condition.getPage(query), searchDTO);
+		Object page = sgProjectInfoService.queryPageList(Condition.getPage(query), searchDTO);
 		return R.data(page);
 	}
 

--
Gitblit v1.9.3