From 9eaf711b027f60a67a33cb5259e06c21bab620d7 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期二, 01 四月 2025 17:54:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/domain/dto/UserInfoDTO.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 8e98b5c..55b9e9f 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
@@ -1,7 +1,5 @@
 package com.sinata.system.domain.dto;
 
-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;
@@ -18,4 +16,8 @@
     @ApiModelProperty("单位名称")
     private SysDepartment department;
     private SysRole role;
+    @ApiModelProperty("当前区域id")
+    private Long currentDepartmentId;
+    @ApiModelProperty("当前区域名称")
+    private String currentDepartmentName;
 }

--
Gitblit v1.7.1