From a2843b599dca4edc4bb72a34ff268c2e1df6c62d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 16 七月 2022 15:44:26 +0800
Subject: [PATCH] !205 StreamUtils优化分组方法返回由HashMap无序转为LinkedHashMap有序 Merge pull request !205 from 抓蛙师/auto-7465549-dev-1657957318499
---
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java | 15 +--------------
1 files changed, 1 insertions(+), 14 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 ef26ff3..c4a46ed 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
@@ -2,8 +2,6 @@
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,7 +14,6 @@
* @date 2021-07-26
*/
@Data
-@ApiModel("娴嬭瘯鍗曡〃瑙嗗浘瀵硅薄")
@ExcelIgnoreUnannotated
public class TestDemoVo {
@@ -26,70 +23,60 @@
* 涓婚敭
*/
@ExcelProperty(value = "涓婚敭")
- @ApiModelProperty("涓婚敭")
private Long id;
/**
* 閮ㄩ棬id
*/
@ExcelProperty(value = "閮ㄩ棬id")
- @ApiModelProperty("閮ㄩ棬id")
private Long deptId;
/**
* 鐢ㄦ埛id
*/
@ExcelProperty(value = "鐢ㄦ埛id")
- @ApiModelProperty("鐢ㄦ埛id")
private Long userId;
/**
* 鎺掑簭鍙�
*/
@ExcelProperty(value = "鎺掑簭鍙�")
- @ApiModelProperty("鎺掑簭鍙�")
- private Long orderNum;
+ private Integer orderNum;
/**
* key閿�
*/
@ExcelProperty(value = "key閿�")
- @ApiModelProperty("key閿�")
private String testKey;
/**
* 鍊�
*/
@ExcelProperty(value = "鍊�")
- @ApiModelProperty("鍊�")
private String value;
/**
* 鍒涘缓鏃堕棿
*/
@ExcelProperty(value = "鍒涘缓鏃堕棿")
- @ApiModelProperty("鍒涘缓鏃堕棿")
private Date createTime;
/**
* 鍒涘缓浜�
*/
@ExcelProperty(value = "鍒涘缓浜�")
- @ApiModelProperty("鍒涘缓浜�")
private String createBy;
/**
* 鏇存柊鏃堕棿
*/
@ExcelProperty(value = "鏇存柊鏃堕棿")
- @ApiModelProperty("鏇存柊鏃堕棿")
private Date updateTime;
/**
* 鏇存柊浜�
*/
@ExcelProperty(value = "鏇存柊浜�")
- @ApiModelProperty("鏇存柊浜�")
private String updateBy;
--
Gitblit v1.9.3