From c49b95fc3576f9a5dad5bcaa6874157d5091f6e0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 27 Aug 2020 09:19:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/resources/error.properties |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/resources/error.properties b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/resources/error.properties
index 0105e19..9872fad 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/resources/error.properties
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/resources/error.properties
@@ -19,4 +19,5 @@
 access_denied_updating=\u6B63\u5728\u5347\u7EA7\u7EF4\u62A4\u4E2D,\u8BF7\u7A0D\u540E\u518D\u8BD5!
 access_denied_disabled=\u8BF7\u6C42\u5730\u5740,\u7981\u6B62\u8BBF\u95EE!
 access_denied_not_open=\u8BF7\u6C42\u5730\u5740,\u62D2\u7EDD\u8BBF\u95EE!
-invalid_=\u65E0\u6548\u7684\u8BBF\u95EE\u4EE4\u724C
\ No newline at end of file
+invalid_=\u65E0\u6548\u7684\u8BBF\u95EE\u4EE4\u724C
+gateway_timeout=\u7F51\u5173\u8D85\u65F6\uFF01

--
Gitblit v1.8.0