From c0211a20f4f2d94fe1ac7657284504afa876b8a0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 04 十一月 2024 18:47:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java
index 9576bec..8fabc3d 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingBillListVO.java
@@ -14,6 +14,9 @@
public class ChargingBillListVO extends TChargingBill {
@ApiModelProperty(value = "账单周期")
private String billWeek;
+ @ApiModelProperty(value = "账户类型名称")
+ private String payTypeName;
+
@ApiModelProperty(value = "充电时间 秒")
private Integer chargingSecond;
@ApiModelProperty(value = "订单数量")
@@ -34,7 +37,8 @@
private BigDecimal serviceCharge;
@ApiModelProperty(value = "平台手续费")
private BigDecimal commissionAmount;
-
@ApiModelProperty(value = "充电电流 度")
private BigDecimal chargingCapacity;
+ @ApiModelProperty(value = "入账金额")
+ private BigDecimal billMoney;
}
--
Gitblit v1.7.1