From 6db1505ab4ec5488855660a6aea4580f7e850dfe Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 14:37:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java
index 1c5ba30..48a0b5c 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java
@@ -23,17 +23,15 @@
private Long chargingSecond;
@ApiModelProperty(value = "平台手续费")
private BigDecimal platFormMoney;
- @ApiModelProperty(value = "三方平台分佣")
- private BigDecimal commission;
+
@ApiModelProperty(value = "车牌号")
private String licensePlate;
@ApiModelProperty(value = "手机号")
private String phone;
+ @ApiModelProperty(value = "uid")
+ private String uid;
- @ApiModelProperty(value = "累计电费")
- private BigDecimal electrovalence;
- @ApiModelProperty(value = "累计服务费")
- private BigDecimal serviceCharge;
+
@ApiModelProperty(value = "时段数")
private Integer count;
@ApiModelProperty(value = "1明星充电 2快电 3新电途")
--
Gitblit v1.7.1