From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/model/vo/RechargeRecordsVO.java | 17 ++++++++---------
1 files changed, 8 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 5f78bf1..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,14 +13,13 @@
@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;
@@ -36,7 +35,7 @@
private Integer type;
private Integer appUserId;
private Integer state;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
private Integer payStatus;
--
Gitblit v1.7.1