From 36d3d9da36c71e65081e38cf9cfbd5e0ff6bfeed Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 14 七月 2023 21:15:42 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
index 299711d..0507011 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
@@ -12,15 +12,17 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 @Service
 public class DokingSysManaentServiceImpl extends ServiceImpl<DockingSystemConfigMapper, DockingSystemConfig> implements IDokingSysManaentService {
 
 
-	/***
-	 * 浠诲姟鐢熸垚鏈嶅姟
-	 */
-	@Autowired( required = false)
-	private IDockingTaskService dockingTaskService;
+//	/***
+//	 * 浠诲姟鐢熸垚鏈嶅姟
+//	 */
+//	@Resource
+//	private IDockingTaskService dockingTaskService;
 
 
 	/***
@@ -52,7 +54,8 @@
 	 */
 	@Override
 	public IPage<DockingTaskVO> gridDockingTask(DockingTask dockingTask, Query query) {
-		IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
+		IPage<DockingTask> pages=null;
+//		IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
 		return DockingTaskWrapper.build().pageVO(pages);
 	}
 

--
Gitblit v1.9.3