From 74c86606c9abc778a3848025395d7c7d6fbcfac0 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 19 七月 2022 15:28:19 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang

---
 safePlatfrom-out-web/src/main/resources/config/application.yaml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/safePlatfrom-out-web/src/main/resources/config/application.yaml b/safePlatfrom-out-web/src/main/resources/config/application.yaml
index cbaaeea..ed41ebd 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application.yaml
@@ -5,10 +5,12 @@
 #    active: prod
     active: out-dev
 
-mybatis-plus:
-  mapper-locations: classpath:config/mapper/**/*.xml
+#mybatis-plus:
+#  mapper-locations: classpath:config/mapper/**/*.xml
 
 logging:
   config: classpath:config/log/log4j2.xml
   level:
     com.gkhy: info
+    com.atomikos: ERROR
+    javax.transaction: ERROR

--
Gitblit v1.9.2