From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountListVO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountListVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountListVO.java
index c6d4056..f2ea33c 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountListVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountListVO.java
@@ -14,15 +14,17 @@
@ApiModel(value = "ChargingBillListVO对象",description = "充电算帐单列表VO")
public class AccountListVO{
@ApiModelProperty(value = "账单数量")
- private String billCount;
+ private Integer billCount;
@ApiModelProperty(value = "总入账金额")
private BigDecimal totalAmount;
@ApiModelProperty(value = "总支付结算金额")
private BigDecimal paymentAmount;
@ApiModelProperty(value = "总退款结算金额")
- private BigDecimal orderAmount;
+ private BigDecimal refundAmount;
@ApiModelProperty(value = "平台手续费")
private BigDecimal commissionAmount;
+ @ApiModelProperty(value = "分佣")
+ private BigDecimal sharingAmount;
@ApiModelProperty(value = "列表数据")
private PageInfo<ChargingBillListVO> list;
--
Gitblit v1.7.1