From 9969bea2a8c1eab64c12a51a2d24d65e5b6c0dd0 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 24 十月 2022 18:12:41 +0800
Subject: [PATCH] 日志导出乱码 日志查询导出 代码重构

---
 ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java b/ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java
index 1d38845..a120182 100644
--- a/ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java
+++ b/ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.*;
 import com.ycl.api.BaseEntity;
 import com.ycl.dto.user.AdminDepartDTO;
+import com.ycl.dto.user.DepartUserDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -38,13 +39,13 @@
     private String departDes;
 
     @ApiModelProperty("閮ㄩ棬绫诲瀷")
-    private byte departType;
+    private Integer departType;
 
     @ApiModelProperty("鐖剁骇id,榛樿0")
     private Long parentId;
 
     @ApiModelProperty("鍋滅敤鐘舵�侊紝0->false,1->true,榛樿鍋滅敤")
-    private byte status;
+    private Short status;
 
     /**
      * 閫昏緫鍒犻櫎 0:false 1:true 榛樿0
@@ -60,4 +61,7 @@
     @TableField(exist = false)
     private List<AdminDepartDTO.UserInfoDTO> userInfoDTOS;
 
+    @TableField(exist = false)
+    private List<DepartUserDTO> departUserDTOS;
+
 }

--
Gitblit v1.8.0