From ef1df7242cb78ab729af8f2e4f59aa4b7ea9615b Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 24 八月 2023 18:54:49 +0800
Subject: [PATCH] 关于集成配置需求更改

---
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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 a532b94..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,7 +20,11 @@
 @Slf4j
 public class DockingApplyGroupCodeSyncScheduling {
 
+<<<<<<< HEAD
 	//@Resource
+=======
+//	@Resource
+>>>>>>> c31b334ae86c8c6240bed10c633513685322d052
 	//private IGroupCodeDuckingSyncService groupCodeDuckingSyncService;
 
 	@Value("${apply.groupCode.isStart:false}")

--
Gitblit v1.9.3