From d729d924aff31c769b90adc99d998d38cdf50ec0 Mon Sep 17 00:00:00 2001
From: liyanqi <15181887205@163.com>
Date: 星期五, 09 九月 2022 22:06:33 +0800
Subject: [PATCH] 修复一些问题
---
ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 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..a7d2a9e 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,14 @@
package com.ycl.vo.depart;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.ycl.api.BasePageVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
+import java.util.List;
/**
* @author Lyq
@@ -23,13 +26,13 @@
private String departDes;
@ApiModelProperty("閮ㄩ棬绫诲瀷")
- private Integer departType;
+ private byte departType;
@ApiModelProperty("鐖剁骇id,榛樿0")
private Long parentId;
- @ApiModelProperty("鍋滅敤鐘舵�侊紝0->false,1->true,榛樿鍋滅敤")
- private byte status;
+// @ApiModelProperty("鍋滅敤鐘舵�侊紝0->false,1->true,榛樿鍋滅敤")
+// private byte status;
}
@ApiModel
@@ -63,18 +66,47 @@
private String departDes;
@ApiModelProperty("閮ㄩ棬绫诲瀷")
- private Integer departType;
+ private byte departType;
@ApiModelProperty("鐖剁骇id,榛樿0")
private Long parentId;
- @ApiModelProperty("鍋滅敤鐘舵�侊紝0->false,1->true,榛樿鍋滅敤")
- private byte status;
+ @ApiModelProperty("鐢ㄦ埛Id闆嗗悎")
+ 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 byte departType;
+
+ @ApiModelProperty("鐢ㄦ埛Id")
+ private Long userId;
+
+ @ApiModelProperty("鐢ㄦ埛鍚�")
+ private String userName;
+ }
+
}
--
Gitblit v1.8.0