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/resources/application-prodapp.yml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/application-prodapp.yml b/src/main/resources/application-prodapp.yml
index 68f7197..58317c6 100644
--- a/src/main/resources/application-prodapp.yml
+++ b/src/main/resources/application-prodapp.yml
@@ -92,6 +92,7 @@
 
 app:
   debug: false
+  project: otc
   redis_expire: 3000
   kline-update-job: false
   newest-price-update-job: false
@@ -101,6 +102,8 @@
   loop-job: false
   rabbit-consumer: false
   block-job: false
+  netty-job: false
+  otc-job: false
 
 aliyun:
   oss:

--
Gitblit v1.9.1