From ecd6e50d0bb2c74e4b3f7a23e0d44f5e001987ea Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 13:57:47 +0800
Subject: [PATCH] 冲突解决

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

diff --git a/src/main/java/com/ruoyi/common/exception/user/UserException.java b/src/main/java/com/ruoyi/common/exception/user/UserException.java
index b85dab6..79160d8 100644
--- a/src/main/java/com/ruoyi/common/exception/user/UserException.java
+++ b/src/main/java/com/ruoyi/common/exception/user/UserException.java
@@ -1,6 +1,6 @@
 package com.ruoyi.common.exception.user;
 
-import com.ruoyi.common.exception.BaseException;
+import com.ruoyi.common.exception.base.BaseException;
 
 /**
  * 鐢ㄦ埛淇℃伅寮傚父绫�

--
Gitblit v1.9.3