From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/main/java/com/ycl/jxkg/base/BaseApiController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/base/BaseApiController.java b/src/main/java/com/ycl/jxkg/base/BaseApiController.java
index 190f688..67e71ba 100644
--- a/src/main/java/com/ycl/jxkg/base/BaseApiController.java
+++ b/src/main/java/com/ycl/jxkg/base/BaseApiController.java
@@ -2,7 +2,7 @@
 
 
 import com.ycl.jxkg.context.WebContext;
-import com.ycl.jxkg.domain.User;
+import com.ycl.jxkg.domain.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**

--
Gitblit v1.8.0