From 967f911721e3a7473ac9d6c90e533453751f3243 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Thu, 29 Oct 2020 10:26:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-config/src/main/resources/application.properties |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kidgrow-config/src/main/resources/application.properties b/kidgrow-config/src/main/resources/application.properties
index 67e9851..63ecf1e 100644
--- a/kidgrow-config/src/main/resources/application.properties
+++ b/kidgrow-config/src/main/resources/application.properties
@@ -37,7 +37,7 @@
 # hystrix.command.default.execution.timeout.enabled: false
 #\u8D85\u65F6\u65F6\u957F
 hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 10000
-
+#\u9694\u79BB\u7EA7\u522B
 hystrix.command.default.execution.isolation.strategy: SEMAPHORE
 
 ##### Redis\u914D\u7F6E

--
Gitblit v1.8.0