From f74a1e6da3e14d666d7fd9a69d8c18c8b48f4f35 Mon Sep 17 00:00:00 2001
From: yeungchihang <842328916@qq.com>
Date: Tue, 15 Nov 2022 15:30:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E7=94=A8=E6=88=B7=E8=B4=A6?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2-=E5=AF=BC=E5=87=BA=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accompany/admin/vo/BillRecordExcelVo.java | 36 +++++++------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/BillRecordExcelVo.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/BillRecordExcelVo.java
index 97da3d2b6..242da5fb2 100644
--- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/BillRecordExcelVo.java
+++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/vo/BillRecordExcelVo.java
@@ -17,53 +17,41 @@ public class BillRecordExcelVo {
 
     @ExcelProperty("账单Id")
     public String billId;
-    @ExcelProperty("查询用户平台号")
-    public Long erbanNo;
     @ExcelProperty("查询用户昵称")
     public String nick;
-    @ExcelProperty("查询用户uid")
-    public Long targetUid;
-    @ExcelProperty("对应对象平台号")
-    public Long targetErbanNo;
+    @ExcelProperty("查询用户平台号")
+    public Long erbanNo;
     @ExcelProperty("对应对象昵称")
     public String targetNick;
-    @ExcelProperty("房间uid")
-    public Long roomUid;
-    @ExcelProperty("房主平台号")
-    public Long roomErbanNo;
+    @ExcelProperty("对应对象平台号")
+    public Long targetErbanNo;
     @ExcelProperty("消费地点房主昵称")
     public String roomNick;
+    @ExcelProperty("房主平台号")
+    public Long roomErbanNo;
+    @ExcelProperty("礼物数量")
+    public Integer giftNum;
+    @ExcelProperty("礼物名称")
+    public String giftName;
     @ExcelProperty("钻石/水晶/金币")
     public BigDecimal amount;
     @ExcelProperty("国家/地区")
     public String country;
-    @ExcelProperty("货币数")
-    public BigDecimal localAmount;
     @ExcelProperty("本地货币代码")
     public String localCurrencyCode;
     @ExcelProperty("货币数")
-    public BigDecimal actualAmount;
+    public BigDecimal localAmount;
     @ExcelProperty("交易币种")
     public String currencyDesc;
     @ExcelProperty("账单类型")
     public String billTypeDesc;
-    @ExcelProperty("账单业务类型")
+    @ExcelProperty("业务类型")
     public String objTypeDesc;
-    @ExcelProperty("账单类型code")
-    private Byte objType;
-    @ExcelProperty("账单业务Id")
-    private String objId;
     @ExcelIgnore
     public Date createTime;
     @ExcelProperty("创建时间")
     public String createTimeStr;
     @ExcelProperty("备注")
     public String remark;
-    @ExcelProperty("礼物id")
-    public Integer giftId;
-    @ExcelProperty("礼物数量")
-    public Integer giftNum;
-    @ExcelProperty("礼物名称")
-    public String giftName;
 
 }