From 2ed572d6b2a4be6b91b3e2a1ed48485abde91553 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 15 Jul 2024 10:54:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zyqs-0502' into rb-copy
---
src/main/java/com/nq/pojo/UserWithdraw.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nq/pojo/UserWithdraw.java b/src/main/java/com/nq/pojo/UserWithdraw.java
index dfc894b..1941f74 100644
--- a/src/main/java/com/nq/pojo/UserWithdraw.java
+++ b/src/main/java/com/nq/pojo/UserWithdraw.java
@@ -1,15 +1,20 @@
package com.nq.pojo;
import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
-
+@Data
public class UserWithdraw {
+ @TableId(type= IdType.AUTO)
private Integer id;
@Excel(name = "用户id")
private Integer userId;
@@ -19,10 +24,10 @@
private Integer agentId;
@Excel(name = "出金金额")
private BigDecimal withAmt;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Kolkata")
@Excel(name = "申请时间", databaseFormat = "yyyyMMddHHmmss", format = "yyyy-MM-dd HH:mm:ss")
private Date applyTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Kolkata")
@Excel(name = "出金时间", databaseFormat = "yyyyMMddHHmmss", format = "yyyy-MM-dd HH:mm:ss")
private Date transTime;
@@ -41,8 +46,9 @@
@Excel(name = "原因")
private String withMsg;
+ @TableField(exist = false)
private String userPhone;
-
+ private String assetsType;
public UserWithdraw(Integer id, Integer userId, String nickName, Integer agentId, BigDecimal withAmt, Date applyTime, Date transTime, String withName, String bankNo, String bankName, String bankAddress, Integer withStatus, BigDecimal withFee, String withMsg) {
--
Gitblit v1.9.3