Merge branch 'master' into Bulbasaur

2021-06-01 15:51:50 +08:00
parent b70da68761 d01bd1581e
commit 6fb7322e3e
9 changed files with 56 additions and 11 deletions
--- a/common-api/src/main/resources/application.yml
+++ b/common-api/src/main/resources/application.yml
@@ -211,6 +211,7 @@ jasypt:
 lili:
  system:
    isDemoSite: true
+    licences: 'temporary'
  statistics:
    # 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数
    onlineMember: 48