From 36fff14de9bb4808d8dbf5c586baf331986e53a3 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 31 十月 2023 22:56:22 +0800
Subject: [PATCH] 修改可输可选新增方法，完善部分漏改按钮code

---
 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