From 8b134c45ea6d783867f9674e3d714ac32f82e2ba Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 15:21:22 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountingStrategyDetailOrderVo.java |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountingStrategyDetailOrderVo.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountingStrategyDetailOrderVo.java
new file mode 100644
index 0000000..b99cac8
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/AccountingStrategyDetailOrderVo.java
@@ -0,0 +1,47 @@
+package com.ruoyi.order.api.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/9/3 14:00
+ */
+@Data
+public class AccountingStrategyDetailOrderVo {
+	@ApiModelProperty(value = "主键")
+	private Integer id;
+	@ApiModelProperty(value = "策略id")
+	private Integer accountingStrategyId;
+	
+	@ApiModelProperty(value = "阶段(1=尖阶段,2=峰阶段,3=平阶段,4=谷阶段)")
+	private Integer type;
+	
+	@ApiModelProperty(value = "开始时间")
+	private String startTime;
+	
+	@ApiModelProperty(value = "结束时间")
+	private String endTime;
+	
+	@ApiModelProperty(value = "电价")
+	private BigDecimal electrovalence;
+	
+	@ApiModelProperty(value = "服务费")
+	private BigDecimal serviceCharge;
+	
+	@ApiModelProperty(value = "原价服务费")
+	private BigDecimal costServiceCharge;
+	
+	@ApiModelProperty(value = "充电订单id")
+	private Long chargingOrderId;
+	
+	private Long start;
+	private Long end;
+	private BigDecimal chargingCapacity;
+}

--
Gitblit v1.7.1