From d34a44a1ffa778c0a95027f67d56544b0faa4930 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 17:16:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java b/src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java
index 0bf2406..f416d39 100644
--- a/src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java
+++ b/src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java
@@ -3,7 +3,7 @@
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.project.system.domain.SysUserDept;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;

--
Gitblit v1.9.3