From c2db28c97e8e5fcd1fa81d6a9887d69b61865184 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期一, 16 十月 2023 08:48:14 +0800
Subject: [PATCH] 1
---
server/src/main/resources/application.yml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index c86705c..3d9a01d 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -9,7 +9,11 @@
# application:
# name: doumeemes
profiles:
- active: standard
+<<<<<<< HEAD
+ active: standardTest
+=======
+ active: standardLingyang
+>>>>>>> e545f382c2989b1a6a510d0fed66b5e835bc163c
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
--
Gitblit v1.9.3