From 937099239caa9136759d5d86b8fbcdc73e6b0510 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期四, 14 九月 2023 10:21:44 +0800
Subject: [PATCH] 小程序
---
server/src/main/resources/application.yml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index f085ed5..3d9a01d 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -9,7 +9,11 @@
# application:
# name: doumeemes
profiles:
+<<<<<<< HEAD
active: standardTest
+=======
+ active: standardLingyang
+>>>>>>> e545f382c2989b1a6a510d0fed66b5e835bc163c
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
--
Gitblit v1.9.3