From 895d69f5db1355b26ba760e79a1f0ae9296ef0c0 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 05 九月 2023 14:32:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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..646d483 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;
/***
@@ -30,6 +32,12 @@
private IDockingLogeService dockingLogeService;
/***
+ * 闆嗘垚浠诲姟鏈嶅姟
+ */
+ @Autowired( required = false)
+ private IDockingTaskService dockingTaskService;
+
+ /***
* 闆嗘垚鎺ュ彛澶村崗璁湇鍔�
*/
@Autowired( required = false)
--
Gitblit v1.9.3