From 5d1d4b8516c6071a4bb69ba507f6d23eb73e8a67 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 31 三月 2023 14:10:38 +0800
Subject: [PATCH] 驾驶舱接口优化
---
ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
index 0779678..47eda99 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycl.entity.depart.UmsDepart;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -58,6 +60,10 @@
@ApiModelProperty(value = "鏈�鍚庣櫥褰曟椂闂�")
private Date loginTime;
+ @ApiModelProperty(value = "璐﹀彿鏈夋晥鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date expirationDate;
+
@ApiModelProperty(value = "甯愬彿鍚敤鐘舵�侊細0->绂佺敤锛�1->鍚敤")
private Integer status;
@@ -80,6 +86,7 @@
@TableField(exist = false)
private String departName;
+
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷")
private Integer userType;
@@ -92,9 +99,12 @@
@ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
private Integer isGrid;
- @ApiModelProperty(value = "瑙掕壊鍒楄〃")
+ @ApiModelProperty(value = "鍏抽敭瀛楁")
@TableField(exist = false)
- private UmsDepart depart;
+ private String keyword;
+ @ApiModelProperty(value = "閮ㄩ棬")
+ @TableField(exist = false)
+ private List<UmsDepart> depart;
@ApiModelProperty(value = "瑙掕壊鍒楄〃")
@TableField(exist = false)
private List<UmsRole> roles;
--
Gitblit v1.8.0