From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/ErpApplication.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 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
new file mode 100644
index 0000000..7c4967c
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/ErpApplication.java
@@ -0,0 +1,24 @@
+package com.example.erp;
+
+import com.example.erp.tools.netty.NettyServer;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.transaction.annotation.Transactional;
+
+//springboot 鍚姩鍏ュ彛
+@SpringBootApplication
+@EnableCaching
+@EnableTransactionManagement//浜嬪姟娉ㄨВ
+//@Transactional//鍦╯ervice閲岄潰鏈夊琛ㄦ搷浣滐紝寮�鍚簨鍔℃敞瑙�
+public class ErpApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(ErpApplication.class, args);
+        /*try {
+            new NettyServer(12345).start();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }*/
+    }
+}

--
Gitblit v1.8.0