From 1f1d4e2defd90f16a4229b9bf98114f42c91405d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 12 十月 2021 11:47:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/satoken' into satoken

---
 ruoyi-admin/src/main/resources/application.yml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index a3e525c..f75ef29 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -289,7 +289,7 @@
   # 绾跨▼姹犵淮鎶ょ嚎绋嬫墍鍏佽鐨勭┖闂叉椂闂�
   keepAliveSeconds: 300
   # 绾跨▼姹犲鎷掔粷浠诲姟(鏃犵嚎绋嬪彲鐢�)鐨勫鐞嗙瓥鐣�
-  # CALLER_RUNS_POLICY 绛夊緟
+  # CALLER_RUNS_POLICY 璋冪敤鏂规墽琛�
   # DISCARD_OLDEST_POLICY 鏀惧純鏈�鏃х殑
   # DISCARD_POLICY 涓㈠純
   # ABORT_POLICY 涓

--
Gitblit v1.9.3