From b902b40fda2f1dccca0825277d07908119deecfd Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 三月 2026 09:57:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_web/src/main/resources/application.yml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/dmmall_web/src/main/resources/application.yml b/server/dmmall_web/src/main/resources/application.yml
index 2bdeacc..f1360c3 100644
--- a/server/dmmall_web/src/main/resources/application.yml
+++ b/server/dmmall_web/src/main/resources/application.yml
@@ -70,7 +70,7 @@
     enabled: true
     mime-types: application/json
 
-  port: 10014
+  port: 12015
   tomcat:
     max-swallow-size: -1
   servlet:

--
Gitblit v1.9.3