From 7bc2b875448f9e5311bcc987691b5475a06dfbcb Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 24 四月 2024 12:43:51 +0800
Subject: [PATCH] 1、集团码返码接口下标越界bug。 2、集团返码，需要修改我们系统中的属性，修改时需要判断每一个字段，确定哪些有修改，然后用oldBusinessData字段记录下修改前旧的业务数据。 3、同步型号代号，记录下对方的创建时间和修改时间。

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