From 15dc0b8f5dd4ec07fde303c3cc20e468f3b448d3 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 24 八月 2023 20:29:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java
index 4b5b57b..f8f99f0 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java
@@ -20,8 +20,12 @@
@Slf4j
public class DockingApplyGroupCodeSyncScheduling {
- @Resource
- private IGroupCodeDuckingSyncService groupCodeDuckingSyncService;
+<<<<<<< HEAD
+ //@Resource
+=======
+// @Resource
+>>>>>>> c31b334ae86c8c6240bed10c633513685322d052
+ //private IGroupCodeDuckingSyncService groupCodeDuckingSyncService;
@Value("${apply.groupCode.isStart:false}")
public boolean APPLY_GRUPCODE_SYNC_ISSTARE;
--
Gitblit v1.9.3