From 9bc2d2981b540aa291cfecde5d33615df56a078b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 22 七月 2022 09:59:19 +0800
Subject: [PATCH] update springboot 2.7.1 => 2.7.2 update hutool 5.8.3 => 5.8.4 update okhttp 4.9.1 => 4.10.0 update lock4j 2.2.1 => 2.2.2 update aws-java-sdk-s3 1.12.248 => 1.12.264 修复依赖安全漏洞 update aliyun.sms 2.0.9 => 2.0.16 update tencent.sms 3.1.537 => 3.1.555 update guava 30.0-jre => 31.1-jre
---
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java | 43 ++++++++++++++++++-------------------------
1 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java
index a299c4a..6836c06 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java
@@ -1,11 +1,10 @@
package com.ruoyi.demo.domain.vo;
-import com.ruoyi.common.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
-import java.util.Date;
+import java.util.Date;
/**
@@ -15,51 +14,45 @@
* @date 2021-07-26
*/
@Data
-@ApiModel("娴嬭瘯鏍戣〃瑙嗗浘瀵硅薄")
+@ExcelIgnoreUnannotated
public class TestTreeVo {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 涓婚敭
+ /**
+ * 涓婚敭
*/
- @ApiModelProperty("涓婚敭")
- private Long id;
+ private Long id;
/**
* 鐖秈d
*/
- @Excel(name = "鐖秈d")
- @ApiModelProperty("鐖秈d")
- private Long parentId;
+ @ExcelProperty(value = "鐖秈d")
+ private Long parentId;
/**
* 閮ㄩ棬id
*/
- @Excel(name = "閮ㄩ棬id")
- @ApiModelProperty("閮ㄩ棬id")
- private Long deptId;
+ @ExcelProperty(value = "閮ㄩ棬id")
+ private Long deptId;
/**
* 鐢ㄦ埛id
*/
- @Excel(name = "鐢ㄦ埛id")
- @ApiModelProperty("鐢ㄦ埛id")
- private Long userId;
+ @ExcelProperty(value = "鐢ㄦ埛id")
+ private Long userId;
/**
* 鏍戣妭鐐瑰悕
*/
- @Excel(name = "鏍戣妭鐐瑰悕")
- @ApiModelProperty("鏍戣妭鐐瑰悕")
- private String treeName;
+ @ExcelProperty(value = "鏍戣妭鐐瑰悕")
+ private String treeName;
/**
* 鍒涘缓鏃堕棿
*/
- @Excel(name = "鍒涘缓鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date createTime;
+ @ExcelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
}
--
Gitblit v1.9.3