From f5d87a5a585adcbb148dee6c62ff6e18c4e7334c Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 26 May 2021 14:36:40 +0800 Subject: [PATCH] conflect --- src/main/resources/application-test.yml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 6517e47..4e3d2de 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -107,6 +107,7 @@ loop-job: true rabbit-consumer: false block-job: true + otc-job: true aliyun: oss: -- Gitblit v1.9.1