修改打包报错问题

 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}")

 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}