From 555ff988376b8650455547d0b6ff7f12f4ae2c63 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期三, 26 三月 2025 17:27:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/domain/dto/UserInfoDTO.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/UserInfoDTO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/UserInfoDTO.java
index fa29d0b..8e98b5c 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/UserInfoDTO.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/UserInfoDTO.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.sinata.common.annotation.Excel;
+import com.sinata.common.core.domain.entity.SysRole;
 import com.sinata.system.domain.SysDepartment;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,4 +17,5 @@
     private Set<String> roles;
     @ApiModelProperty("单位名称")
     private SysDepartment department;
+    private SysRole role;
 }

--
Gitblit v1.7.1