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 | 8 ++++++--
1 files changed, 6 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 066700f..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
@@ -4,17 +4,21 @@
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 {
+ /*try {
new NettyServer(12345).start();
} catch (Exception e) {
throw new RuntimeException(e);
- }
+ }*/
}
}
--
Gitblit v1.8.0