From b4b44f2021dbf083b7057fb7e192b72d08b4bf17 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 09:23:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java
index b616194..2318e75 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java
@@ -73,7 +73,7 @@
@TableField("period_electric_price")
private BigDecimal periodElectricPrice;
- @ApiModelProperty(value = "时段服务费")
+ @ApiModelProperty(value = "时段服务费(最终服务费 含折扣)")
@TableField("period_service_price")
private BigDecimal periodServicePrice;
@@ -93,9 +93,7 @@
@TableField(exist = false)
private BigDecimal couponDiscount;
- @ApiModelProperty(value = "最终服务费")
- @TableField(exist = false)
- private BigDecimal finalService;
+
}
--
Gitblit v1.7.1