From b23b243473fc9ab20ca62eebf3668c143e2e7d23 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 15:30:53 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsVO.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsVO.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsVO.java
index 244fea6..3dcad0d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsVO.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/RechargeRecordsVO.java
@@ -1,5 +1,6 @@
package com.dsh.guns.modular.system.model;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
@@ -20,16 +21,22 @@
* {title: '玩湃币数量', field: 'playPaiCoins', visible: true, align: 'center', valign: 'middle'},
* {title: '充值类型', field: 'type', visible: true, align: 'center', valign: 'middle'},
*/
- private Integer id;
+
+ @JsonFormat(shape = JsonFormat.Shape.STRING)
+ private Long id;
private String provinceAndCity;
private String name;
private String phone;
- private Date time;
+ private Date payTime;
private BigDecimal amount;
private Integer playPaiCoins;
/**
* 1 = 会员 2 =非会员
*/
private Integer type;
-
+ private Integer appUserId;
+ private Integer state;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ private Date insertTime;
+ private Integer payStatus;
}
--
Gitblit v1.7.1