From 1f42bd3d22c104aaa2d780c20a555b5e467858bf Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期一, 07 十一月 2022 22:10:52 +0800
Subject: [PATCH] !245 数据源由 Druid 修改为 Hikari * update 更新 dataSource 数据源, 由 druid 修改为 hikari, 更新相关配置 ;
---
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java | 64 +++++++++++++------------------
1 files changed, 27 insertions(+), 37 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..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
@@ -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,79 +14,70 @@
* @date 2021-07-26
*/
@Data
-@ApiModel("娴嬭瘯鍗曡〃瑙嗗浘瀵硅薄")
+@ExcelIgnoreUnannotated
public class TestDemoVo {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 涓婚敭
+ /**
+ * 涓婚敭
*/
- @ApiModelProperty("涓婚敭")
- private Long id;
+ @ExcelProperty(value = "涓婚敭")
+ private Long id;
/**
* 閮ㄩ棬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 Long orderNum;
+ @ExcelProperty(value = "鎺掑簭鍙�")
+ private Integer orderNum;
/**
* key閿�
*/
- @Excel(name = "key閿�")
- @ApiModelProperty("key閿�")
- private String testKey;
+ @ExcelProperty(value = "key閿�")
+ private String testKey;
/**
* 鍊�
*/
- @Excel(name = "鍊�")
- @ApiModelProperty("鍊�")
- private String value;
+ @ExcelProperty(value = "鍊�")
+ private String value;
/**
* 鍒涘缓鏃堕棿
*/
- @Excel(name = "鍒涘缓鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date createTime;
+ @ExcelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
/**
* 鍒涘缓浜�
*/
- @Excel(name = "鍒涘缓浜�")
- @ApiModelProperty("鍒涘缓浜�")
- private String createBy;
+ @ExcelProperty(value = "鍒涘缓浜�")
+ private String createBy;
/**
* 鏇存柊鏃堕棿
*/
- @Excel(name = "鏇存柊鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
- @ApiModelProperty("鏇存柊鏃堕棿")
- private Date updateTime;
+ @ExcelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
/**
* 鏇存柊浜�
*/
- @Excel(name = "鏇存柊浜�")
- @ApiModelProperty("鏇存柊浜�")
- private String updateBy;
+ @ExcelProperty(value = "鏇存柊浜�")
+ private String updateBy;
}
--
Gitblit v1.9.3