From 6c2e9ba62c418185361179e7014862c481f34e17 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 09 Mar 2022 14:22:09 +0800 Subject: [PATCH] conflect merge --- src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java b/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java index 662cd9a..d4e957b 100644 --- a/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java +++ b/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java @@ -27,7 +27,7 @@ */ @Slf4j @Component -@ConditionalOnProperty(prefix = "app", name = "newest-price-update-job-contract", havingValue = "true") +@ConditionalOnProperty(prefix = "app", name = "newest-price-update-job", havingValue = "true") @Deprecated public class OrderProducerInit { -- Gitblit v1.9.1