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/vo/depart/DepartVO.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 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..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,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
@@ -68,13 +72,42 @@
@ApiModelProperty("鐖剁骇id,榛樿0")
private Long parentId;
- @ApiModelProperty("鍋滅敤鐘舵�侊紝0->false,1->true,榛樿鍋滅敤")
- private byte status;
+ @ApiModelProperty("璐熻矗浜篒d闆嗗悎")
+ private List<Long> userIds;
+
+// @ApiModelProperty("鍋滅敤鐘舵�侊紝0->false,1->true,榛樿鍋滅敤")
+// private byte status;
}
@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;
+
+ @ApiModelProperty("閮ㄩ棬鎻忚堪")
+ private String departDes;
+
+ @ApiModelProperty("閮ㄩ棬绫诲瀷")
+ private Integer departType;
+
+ @ApiModelProperty("鐢ㄦ埛Id")
+ private Long userId;
+
+ @ApiModelProperty("鐢ㄦ埛鍚�")
+ private String userName;
+ }
+
}
--
Gitblit v1.8.0