From e9c1bc2e789f6f9f8c52fbd10788ad5a0d1f841b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 12 七月 2024 13:39:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/main/java/com/ycl/jxkg/controller/student/UserController.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/controller/student/UserController.java b/src/main/java/com/ycl/jxkg/controller/student/UserController.java
index 6e76966..6896106 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/UserController.java
+++ b/src/main/java/com/ycl/jxkg/controller/student/UserController.java
@@ -6,8 +6,8 @@
 import com.ycl.jxkg.domain.entity.MessageUser;
 import com.ycl.jxkg.domain.entity.User;
 import com.ycl.jxkg.domain.entity.UserEventLog;
-import com.ycl.jxkg.domain.enums.RoleEnum;
-import com.ycl.jxkg.domain.enums.UserStatusEnum;
+import com.ycl.jxkg.enums.RoleEnum;
+import com.ycl.jxkg.enums.UserStatusEnum;
 import com.ycl.jxkg.event.UserEvent;
 import com.ycl.jxkg.service.AuthenticationService;
 import com.ycl.jxkg.service.MessageService;
@@ -46,7 +46,6 @@
         UserResponseVO userVm = UserResponseVO.from(user);
         return Result.ok(userVm);
     }
-
 
     @RequestMapping(value = "/register", method = RequestMethod.POST)
     public Result register(@RequestBody @Valid UserRegisterVO model) {

--
Gitblit v1.8.0