From 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 07 九月 2021 09:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActUserWalletTradeExcelVO.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActUserWalletTradeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActUserWalletTradeExcelVO.java
index 4b9038f..62bc354 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActUserWalletTradeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActUserWalletTradeExcelVO.java
@@ -1,14 +1,13 @@
package com.panzhihua.common.model.vos.community;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
-import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
-import lombok.Data;
-
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
/**
* @description: 批量导出钱包交易记录
@@ -20,32 +19,31 @@
/**
* 金额
*/
- @ExcelProperty(value = "金额" ,index = 0)
+ @ExcelProperty(value = "金额", index = 0)
private BigDecimal amount;
/**
* 姓名
*/
- @ExcelProperty(value = "姓名" ,index = 1)
+ @ExcelProperty(value = "姓名", index = 1)
private String userName;
/**
* 用户手机号
*/
- @ExcelProperty(value = "账号" ,index = 2)
+ @ExcelProperty(value = "账号", index = 2)
private String phone;
/**
* 时间
*/
- @ExcelProperty(value = "时间" ,index = 3)
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @ExcelProperty(value = "时间", index = 3)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
/**
* 操作人
*/
- @ExcelProperty(value = "操作人" ,index = 4)
+ @ExcelProperty(value = "操作人", index = 4)
private String createBy;
}
-
--
Gitblit v1.7.1