From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 08 九月 2023 11:16:35 +0800
Subject: [PATCH] 优化
---
ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 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 66489d2..48db4ed 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,11 +1,13 @@
package com.ycl.vo.depart;
import com.ycl.api.BasePageVO;
+import com.ycl.entity.depart.DepartManager;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
+import java.util.List;
/**
* @author Lyq
@@ -28,8 +30,10 @@
@ApiModelProperty("鐖剁骇id,榛樿0")
private Long parentId;
- @ApiModelProperty("鍋滅敤鐘舵�侊紝0->false,1->true,榛樿鍋滅敤")
- private byte status;
+ @ApiModelProperty("娣诲姞鐢ㄦ埛")
+ private List<DepartManager> departManagerList;
+// @ApiModelProperty("鍋滅敤鐘舵�侊紝0->false,1->true,榛樿鍋滅敤")
+// private byte status;
}
@ApiModel
@@ -47,15 +51,32 @@
@NotNull(message = "閮ㄩ棬id涓嶈兘涓虹┖")
private Long id;
@ApiModelProperty("鍋滅敤鐘舵�侊紝0->false,1->true,榛樿鍋滅敤")
- private byte status;
+ private Short status;
}
@ApiModel
@Data
- public static class UpdateDepartVO {
+ public static class UpdateDepartVO extends AddDepartVO {
@ApiModelProperty(value = "閮ㄩ棬id")
@NotNull(message = "閮ㄩ棬id涓嶈兘涓虹┖")
private Long id;
+ }
+
+ @ApiModel
+ @Data
+ public static class PageDepartVO extends BasePageVO {
+ @ApiModelProperty(value = "閮ㄩ棬绫诲瀷,0榛樿鏌ヨ鍏ㄩ儴", example = "0")
+ private Integer departType;
+
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ private String departName;
+ }
+
+ @Data
+ public static class AdminDepartInfoVO {
+ @ApiModelProperty("閮ㄩ棬Id")
+ private Long departId;
+
@ApiModelProperty("閮ㄩ棬鍚嶇О")
private String departName;
@@ -65,16 +86,11 @@
@ApiModelProperty("閮ㄩ棬绫诲瀷")
private Integer departType;
- @ApiModelProperty("鐖剁骇id,榛樿0")
- private Long parentId;
+ @ApiModelProperty("鐢ㄦ埛Id")
+ private Long userId;
- @ApiModelProperty("鍋滅敤鐘舵�侊紝0->false,1->true,榛樿鍋滅敤")
- private byte status;
+ @ApiModelProperty("鐢ㄦ埛鍚�")
+ private String userName;
}
- @ApiModel
- @Data
- public static class PageDepartVO extends BasePageVO {
-
- }
}
--
Gitblit v1.8.0