From fb40c4dfec5954c321f38bb86e9d07eb87b97bfd Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 18 三月 2026 08:21:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

---
 src/main/java/com/ruoyi/common/exception/GlobalException.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/common/exception/GlobalException.java b/src/main/java/com/ruoyi/common/exception/GlobalException.java
index 318b9ae..9f0dec4 100644
--- a/src/main/java/com/ruoyi/common/exception/GlobalException.java
+++ b/src/main/java/com/ruoyi/common/exception/GlobalException.java
@@ -7,7 +7,6 @@
  */
 public class GlobalException extends RuntimeException
 {
-
     private static final long serialVersionUID = 1L;
 
     /**
@@ -45,6 +44,7 @@
         return this;
     }
 
+    @Override
     public String getMessage()
     {
         return message;

--
Gitblit v1.9.3