From 4e7f81ab7b37b5fc51c3054a36942adbcfb8dca8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 03 九月 2024 19:12:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java |    5 +----
 1 files changed, 1 insertions(+), 4 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..61ba66b 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
@@ -30,10 +30,7 @@
     @ApiModelProperty(value = "手机号")
     private String phone;
 
-    @ApiModelProperty(value = "累计电费")
-    private BigDecimal electrovalence;
-    @ApiModelProperty(value = "累计服务费")
-    private BigDecimal serviceCharge;
+
     @ApiModelProperty(value = "时段数")
     private Integer count;
     @ApiModelProperty(value = "1明星充电 2快电 3新电途")

--
Gitblit v1.7.1