From 22b4f87232c9cb1e6f49927c8d0e11ec95f51724 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 28 九月 2021 09:32:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 6a7b7d0..145469d 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -243,6 +243,11 @@
     name: Lion Li
     email: crazylionli@163.com
     url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
+  groups:
+    - name: 婕旂ず妗堜緥
+      basePackage: com.ruoyi.demo
+    - name: 绯荤粺妯″潡
+      basePackage: com.ruoyi.admin
 
 # 闃叉XSS鏀诲嚮
 xss:
@@ -266,7 +271,7 @@
   # 绾跨▼姹犵淮鎶ょ嚎绋嬫墍鍏佽鐨勭┖闂叉椂闂�
   keepAliveSeconds: 300
   # 绾跨▼姹犲鎷掔粷浠诲姟(鏃犵嚎绋嬪彲鐢�)鐨勫鐞嗙瓥鐣�
-  # CALLER_RUNS_POLICY 绛夊緟
+  # CALLER_RUNS_POLICY 璋冪敤鏂规墽琛�
   # DISCARD_OLDEST_POLICY 鏀惧純鏈�鏃х殑
   # DISCARD_POLICY 涓㈠純
   # ABORT_POLICY 涓

--
Gitblit v1.9.3