From 97b098106d33e58434e1f25d88d6b6081411f6d1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 28 八月 2023 10:19:52 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

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

--
Gitblit v1.9.3