From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/ErpApplication.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/ErpApplication.java b/north-glass-erp/src/main/java/com/example/erp/ErpApplication.java
index f413bed..7c4967c 100644
--- a/north-glass-erp/src/main/java/com/example/erp/ErpApplication.java
+++ b/north-glass-erp/src/main/java/com/example/erp/ErpApplication.java
@@ -15,10 +15,10 @@
public class ErpApplication {
public static void main(String[] args) {
SpringApplication.run(ErpApplication.class, args);
- try {
+ /*try {
new NettyServer(12345).start();
} catch (Exception e) {
throw new RuntimeException(e);
- }
+ }*/
}
}
--
Gitblit v1.8.0