From eb2be90e74adfa06ee251f80c08243d0301ce467 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 10:49:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestTreeVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java
similarity index 67%
rename from ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestTreeVo.java
rename to ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java
index c6ea558..a299c4a 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestTreeVo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java
@@ -1,13 +1,9 @@
-package com.ruoyi.demo.vo;
+package com.ruoyi.demo.domain.vo;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
import java.util.Date;
@@ -16,7 +12,7 @@
* 娴嬭瘯鏍戣〃瑙嗗浘瀵硅薄 test_tree
*
* @author Lion Li
- * @date 2021-05-30
+ * @date 2021-07-26
*/
@Data
@ApiModel("娴嬭瘯鏍戣〃瑙嗗浘瀵硅薄")
@@ -24,34 +20,44 @@
private static final long serialVersionUID = 1L;
- /** 涓婚敭 */
+ /**
+ * 涓婚敭
+ */
@ApiModelProperty("涓婚敭")
- @JsonSerialize(using = ToStringSerializer.class)
private Long id;
- /** 鐖秈d */
+ /**
+ * 鐖秈d
+ */
@Excel(name = "鐖秈d")
@ApiModelProperty("鐖秈d")
private Long parentId;
- /** 閮ㄩ棬id */
+ /**
+ * 閮ㄩ棬id
+ */
@Excel(name = "閮ㄩ棬id")
@ApiModelProperty("閮ㄩ棬id")
private Long deptId;
- /** 鐢ㄦ埛id */
+ /**
+ * 鐢ㄦ埛id
+ */
@Excel(name = "鐢ㄦ埛id")
@ApiModelProperty("鐢ㄦ埛id")
private Long userId;
- /** 鏍戣妭鐐瑰悕 */
+ /**
+ * 鏍戣妭鐐瑰悕
+ */
@Excel(name = "鏍戣妭鐐瑰悕")
@ApiModelProperty("鏍戣妭鐐瑰悕")
private String treeName;
- /** 鍒涘缓鏃堕棿 */
+ /**
+ * 鍒涘缓鏃堕棿
+ */
@Excel(name = "鍒涘缓鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鍒涘缓鏃堕棿")
private Date createTime;
--
Gitblit v1.9.3