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/TestDemoVo.java | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestDemoVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java
similarity index 67%
rename from ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestDemoVo.java
rename to ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java
index d1eb8bf..9ab4ba9 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestDemoVo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java
@@ -1,12 +1,9 @@
-package com.ruoyi.demo.vo;
+package com.ruoyi.demo.domain.vo;
-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;
@@ -15,7 +12,7 @@
* 娴嬭瘯鍗曡〃瑙嗗浘瀵硅薄 test_demo
*
* @author Lion Li
- * @date 2021-05-30
+ * @date 2021-07-26
*/
@Data
@ApiModel("娴嬭瘯鍗曡〃瑙嗗浘瀵硅薄")
@@ -24,57 +21,70 @@
private static final long serialVersionUID = 1L;
/**
- * 涓婚敭
- * 濡傛灉鏄嚜瀹氫箟id 鎴栬�� 闆姳id
- * 闇�瑕佸鍔犲簭鍒楀寲涓哄瓧绗︿覆娉ㄨВ 鍥犱负Long鍒板墠绔細澶辩湡
- */
+ * 涓婚敭
+ */
@ApiModelProperty("涓婚敭")
- @JsonSerialize(using = ToStringSerializer.class)
private Long id;
- /** 閮ㄩ棬id */
+ /**
+ * 閮ㄩ棬id
+ */
@Excel(name = "閮ㄩ棬id")
@ApiModelProperty("閮ㄩ棬id")
private Long deptId;
- /** 鐢ㄦ埛id */
+ /**
+ * 鐢ㄦ埛id
+ */
@Excel(name = "鐢ㄦ埛id")
@ApiModelProperty("鐢ㄦ埛id")
private Long userId;
- /** 鎺掑簭鍙� */
+ /**
+ * 鎺掑簭鍙�
+ */
@Excel(name = "鎺掑簭鍙�")
@ApiModelProperty("鎺掑簭鍙�")
private Long orderNum;
- /** key閿� */
+ /**
+ * key閿�
+ */
@Excel(name = "key閿�")
@ApiModelProperty("key閿�")
private String testKey;
- /** 鍊� */
+ /**
+ * 鍊�
+ */
@Excel(name = "鍊�")
@ApiModelProperty("鍊�")
private String value;
- /** 鍒涘缓鏃堕棿 */
+ /**
+ * 鍒涘缓鏃堕棿
+ */
@Excel(name = "鍒涘缓鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
-// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鍒涘缓鏃堕棿")
private Date createTime;
- /** 鍒涘缓浜� */
+ /**
+ * 鍒涘缓浜�
+ */
@Excel(name = "鍒涘缓浜�")
@ApiModelProperty("鍒涘缓浜�")
private String createBy;
- /** 鏇存柊鏃堕棿 */
+ /**
+ * 鏇存柊鏃堕棿
+ */
@Excel(name = "鏇存柊鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
-// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鏇存柊鏃堕棿")
private Date updateTime;
- /** 鏇存柊浜� */
+ /**
+ * 鏇存柊浜�
+ */
@Excel(name = "鏇存柊浜�")
@ApiModelProperty("鏇存柊浜�")
private String updateBy;
--
Gitblit v1.9.3