From 15041c37e21f29bb37acd5efd4ec1b9bba657c65 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 15 十月 2024 09:42:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index 382ce1d..0202131 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -158,6 +158,10 @@
     @ApiModelProperty(value = "退款流水号")
     @TableField("refund_code")
     private String refundCode;
+
+    @ApiModelProperty(value = "标题")
+    @TableField("title")
+    private String title;
     @ApiModelProperty(value = "退款原因")
     @TableField(exist = false)
     private String refundReason;
@@ -173,6 +177,18 @@
     @ApiModelProperty(value = "累计电费")
     @TableField("electrovalence")
     private BigDecimal electrovalence;
+    @ApiModelProperty(value = "电流")
+    @TableField("current")
+    private BigDecimal current;
+    @ApiModelProperty(value = "电压")
+    @TableField("voltage")
+    private BigDecimal voltage;
+    @ApiModelProperty(value = "电量")
+    @TableField("electricity")
+    private BigDecimal electricity;
+    @ApiModelProperty(value = "功率")
+    @TableField("power")
+    private BigDecimal power;
 
     @ApiModelProperty(value = "退款状态(1=退款中,2=退款成功)")
     @TableField("refund_status")

--
Gitblit v1.7.1