From d46beba25ccb64a1047a98d642b6ce45e82f0bee Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 17 十月 2022 18:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java b/ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java
index d1639f4..e0004ac 100644
--- a/ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java
+++ b/ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java
@@ -1,8 +1,7 @@
package com.ycl.vo.depart;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.ycl.api.BasePageVO;
+import com.ycl.entity.depart.DepartManager;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -26,11 +25,13 @@
private String departDes;
@ApiModelProperty("閮ㄩ棬绫诲瀷")
- private byte departType;
+ private Integer departType;
@ApiModelProperty("鐖剁骇id,榛樿0")
private Long parentId;
+ @ApiModelProperty("娣诲姞鐢ㄦ埛")
+ private List<DepartManager> departManagerList;
// @ApiModelProperty("鍋滅敤鐘舵�侊紝0->false,1->true,榛樿鍋滅敤")
// private byte status;
}
@@ -66,7 +67,7 @@
private String departDes;
@ApiModelProperty("閮ㄩ棬绫诲瀷")
- private byte departType;
+ private Integer departType;
@ApiModelProperty("鐖剁骇id,榛樿0")
private Long parentId;
@@ -100,7 +101,7 @@
private String departDes;
@ApiModelProperty("閮ㄩ棬绫诲瀷")
- private byte departType;
+ private Integer departType;
@ApiModelProperty("鐢ㄦ埛Id")
private Long userId;
--
Gitblit v1.8.0