From dfea866e55c725bd601ff84c92dff30f83057571 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 30 三月 2023 19:56:59 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 8e280bb..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,7 +39,7 @@
private String departDes;
@ApiModelProperty("閮ㄩ棬绫诲瀷")
- private Long departType;
+ private Integer departType;
@ApiModelProperty("鐖剁骇id,榛樿0")
private Long parentId;
@@ -60,4 +61,7 @@
@TableField(exist = false)
private List<AdminDepartDTO.UserInfoDTO> userInfoDTOS;
+ @TableField(exist = false)
+ private List<DepartUserDTO> departUserDTOS;
+
}
--
Gitblit v1.8.0