From 5580d71c7a333cb0e95a6c31d3354c760ae3b8de Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 22 八月 2024 14:00:59 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 9f1178f..81744d1 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
@@ -86,9 +86,13 @@
@TableField("end_time")
private LocalDateTime endTime;
- @ApiModelProperty(value = "状态（0=未知，1=等待中，2=启动中，3=充电中，4=停止中，5=已结束）")
+ @ApiModelProperty(value = "状态（0=未知，1=等待中/已插枪，2=启动中，3=充电中，4=停止中，5=已结束）")
@TableField("status")
private Integer status;
+
+ @ApiModelProperty(value = "结束方式（0=异常终止，1=主动终止，2=满电终止，3=费用不足终止）")
+ @TableField("end_mode")
+ private Integer endMode;
@ApiModelProperty(value = "充值金额")
@TableField("recharge_amount")
@@ -106,7 +110,7 @@
@TableField("recharge_serial_number")
private String rechargeSerialNumber;
- @ApiModelProperty(value = "订单金额")
+ @ApiModelProperty(value = "订单金额(总金额)")
@TableField("order_amount")
private BigDecimal orderAmount;
--
Gitblit v1.7.1