From fb78c45712e998a94c407e4484ad89e28d113525 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 24 八月 2023 21:05:08 +0800
Subject: [PATCH] 修改打包报错问题
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/Scheduling/DockingApplyGroupCodeSyncScheduling.java | 4 ----
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/resources/application-prod.yml | 6 +++---
2 files changed, 3 insertions(+), 7 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}")
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/resources/application-prod.yml b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/resources/application-prod.yml
index 8931921..4ccc546 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/resources/application-prod.yml
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/resources/application-prod.yml
@@ -5,6 +5,6 @@
#鏁版嵁婧愰厤缃�
spring:
datasource:
- url: ${ubcs.datasource.mdm.dev.url}
- username: ${ubcs.datasource.mdm.dev.username}
- password: ${ubcs.datasource.mdm.dev.password}
+ url: ${ubcs.datasource.mdm.prod.url}
+ username: ${ubcs.datasource.mdm.prod.username}
+ password: ${ubcs.datasource.mdm.prod.password}
--
Gitblit v1.9.3