From 1c7c8e034add7e68602bdb56be08f63bac1262b7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 10 二月 2026 10:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

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

--
Gitblit v1.9.3