From 006388b29f309e1072e1e686a9cb3661debe6b7d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 26 十月 2024 10:00:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/ChargingBillExport.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/ChargingBillExport.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/ChargingBillExport.java
index 3c826b2..44efc03 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/ChargingBillExport.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/ChargingBillExport.java
@@ -17,14 +17,12 @@
private String accountType;
@Excel(name = "账单分类",width = 30,replace = {"全站账单_1","各个站点账单_2"})
private String type;
- @Excel(name = "账单类型",width = 30)
- private String billType;
+
@Excel(name = "账单周期",width = 30 )
private String billWeek;
@Excel(name = "账单生成日期",width = 30)
private String billTime;
- @Excel(name = "状态",width = 30)
- private String state;
+
@Excel(name = "站点名称",width = 30)
private String siteName;
@Excel(name = "支付金额",width = 30)
--
Gitblit v1.7.1