From edade5a0933d5abf784e8a86785bb5d0b9c5a8ac Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期一, 17 十月 2022 21:33:17 +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/UmsDepartVO.java | 28 +++-------------------------
1 files changed, 3 insertions(+), 25 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/vo/depart/UmsDepartVO.java b/ycl-common/src/main/java/com/ycl/vo/depart/UmsDepartVO.java
index 9abc73e..5bdc4be 100644
--- a/ycl-common/src/main/java/com/ycl/vo/depart/UmsDepartVO.java
+++ b/ycl-common/src/main/java/com/ycl/vo/depart/UmsDepartVO.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.ycl.api.BaseEntity;
import com.ycl.dto.user.AdminDepartDTO;
+import com.ycl.entity.depart.UmsDepart;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@@ -22,32 +23,9 @@
@Getter
@Setter
@ApiModel(value = "umsDepartVO", description = "閮ㄩ棬琛�")
-public class UmsDepartVO {
-
- @ApiModelProperty("涓婚敭")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- @ApiModelProperty("閮ㄩ棬鍚嶇О")
- private String departName;
-
- @ApiModelProperty("閮ㄩ棬鎻忚堪")
- private String departDes;
+public class UmsDepartVO extends UmsDepart {
@ApiModelProperty("閮ㄩ棬绫诲瀷")
- private String departType;
+ private String departTypeName;
- @ApiModelProperty("鐖剁骇id,榛樿0")
- private Long parentId;
-
- @ApiModelProperty("鍋滅敤鐘舵�侊紝0->false,1->true,榛樿鍋滅敤")
- private Short status;
-
- /**
- * 閫昏緫鍒犻櫎 0:false 1:true 榛樿0
- */
- @ApiModelProperty(value = "鏄惁鍒犻櫎", hidden = true)
- @TableField(select = false)
- @TableLogic()
- private byte isDeleted;
}
--
Gitblit v1.8.0