From 032f7c07e272dae9a857ed76b480dc391dc4073f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 三月 2024 14:18:47 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/model/vo/RechargeRecordsVO.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/RechargeRecordsVO.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/RechargeRecordsVO.java
index 03ae858..60fe1bd 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/RechargeRecordsVO.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/RechargeRecordsVO.java
@@ -13,26 +13,30 @@
@Data
public class RechargeRecordsVO {
/**
- *
- * {title: '所在省市', field: 'provinceAndCity', visible: true, align: 'center', valign: 'middle'},
- * {title: '充值用户', field: 'name', visible: true, align: 'center', valign: 'middle'},
- * {title: '联系方式', field: 'phone', visible: true, align: 'center', valign: 'middle'},
- * {title: '充值时间', field: 'time', visible: true, align: 'center', valign: 'middle'},
- * {title: '充值金额', field: 'amount', visible: true, align: 'center', valign: 'middle'},
- * {title: '玩湃币数量', field: 'playPaiCoins', visible: true, align: 'center', valign: 'middle'},
- * {title: '充值类型', field: 'type', visible: true, align: 'center', valign: 'middle'},
+ * {title: '所在省市', field: 'provinceAndCity', visible: true, align: 'center', valign: 'middle'},
+ * {title: '充值用户', field: 'name', visible: true, align: 'center', valign: 'middle'},
+ * {title: '联系方式', field: 'phone', visible: true, align: 'center', valign: 'middle'},
+ * {title: '充值时间', field: 'time', visible: true, align: 'center', valign: 'middle'},
+ * {title: '充值金额', field: 'amount', visible: true, align: 'center', valign: 'middle'},
+ * {title: '玩湃币数量', field: 'playPaiCoins', visible: true, align: 'center', valign: 'middle'},
+ * {title: '充值类型', field: 'type', visible: true, align: 'center', valign: 'middle'},
*/
@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