From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:24 +0800
Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev
---
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java
index 9ab4ba9..3c8e452 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java
@@ -1,9 +1,11 @@
package com.ruoyi.demo.domain.vo;
-import com.ruoyi.common.annotation.Excel;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
import java.util.Date;
@@ -16,6 +18,7 @@
*/
@Data
@ApiModel("娴嬭瘯鍗曡〃瑙嗗浘瀵硅薄")
+@ExcelIgnoreUnannotated
public class TestDemoVo {
private static final long serialVersionUID = 1L;
@@ -29,63 +32,63 @@
/**
* 閮ㄩ棬id
*/
- @Excel(name = "閮ㄩ棬id")
+ @ExcelProperty(value = "閮ㄩ棬id")
@ApiModelProperty("閮ㄩ棬id")
private Long deptId;
/**
* 鐢ㄦ埛id
*/
- @Excel(name = "鐢ㄦ埛id")
+ @ExcelProperty(value = "鐢ㄦ埛id")
@ApiModelProperty("鐢ㄦ埛id")
private Long userId;
/**
* 鎺掑簭鍙�
*/
- @Excel(name = "鎺掑簭鍙�")
+ @ExcelProperty(value = "鎺掑簭鍙�")
@ApiModelProperty("鎺掑簭鍙�")
private Long orderNum;
/**
* key閿�
*/
- @Excel(name = "key閿�")
+ @ExcelProperty(value = "key閿�")
@ApiModelProperty("key閿�")
private String testKey;
/**
* 鍊�
*/
- @Excel(name = "鍊�")
+ @ExcelProperty(value = "鍊�")
@ApiModelProperty("鍊�")
private String value;
/**
* 鍒涘缓鏃堕棿
*/
- @Excel(name = "鍒涘缓鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
+ @ExcelProperty(value = "鍒涘缓鏃堕棿")
@ApiModelProperty("鍒涘缓鏃堕棿")
private Date createTime;
/**
* 鍒涘缓浜�
*/
- @Excel(name = "鍒涘缓浜�")
+ @ExcelProperty(value = "鍒涘缓浜�")
@ApiModelProperty("鍒涘缓浜�")
private String createBy;
/**
* 鏇存柊鏃堕棿
*/
- @Excel(name = "鏇存柊鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
+ @ExcelProperty(value = "鏇存柊鏃堕棿")
@ApiModelProperty("鏇存柊鏃堕棿")
private Date updateTime;
/**
* 鏇存柊浜�
*/
- @Excel(name = "鏇存柊浜�")
+ @ExcelProperty(value = "鏇存柊浜�")
@ApiModelProperty("鏇存柊浜�")
private String updateBy;
--
Gitblit v1.9.3