From 3f9ebf19e687c33287b0eaec64d4564a212f57db Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 12 十月 2022 16:59:57 +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 7c8cf83..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;
@@ -44,7 +45,7 @@
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