From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/admin_timer/src/main/resources/application.yml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/server/visits/admin_timer/src/main/resources/application.yml b/server/visits/admin_timer/src/main/resources/application.yml
index fefb609..459addc 100644
--- a/server/visits/admin_timer/src/main/resources/application.yml
+++ b/server/visits/admin_timer/src/main/resources/application.yml
@@ -10,7 +10,7 @@
   #  application:
   #    name: doumeevisit
   profiles:
-    active: proHS
+    active: dev
 
   # JSON杩斿洖閰嶇疆
   jackson:
@@ -23,6 +23,8 @@
       max-file-size: 200MB
       max-request-size: 200MB
       enabled: true
+  main:
+    allow-circular-references: true
 # MyBatis閰嶇疆
 mybatis-plus:
   mapper-locations: classpath*:/mappers/**/*.xml

--
Gitblit v1.9.3