From ab46a451cf1c94b01e8718e2aa6be6c7fc1886c1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 16 八月 2024 15:32:50 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 3f36bcb..9f1178f 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
@@ -50,7 +50,7 @@
@ApiModelProperty(value = "充电车辆 id")
@TableField("app_user_car_id")
- private Integer appUserCarId;
+ private Long appUserCarId;
@ApiModelProperty(value = "站点 id")
@TableField("site_id")
@@ -67,6 +67,14 @@
@ApiModelProperty(value = "充电枪id")
@TableField("charging_gun_id")
private Integer chargingGunId;
+
+ @ApiModelProperty(value = "充电总度数")
+ @TableField("charging_capacity")
+ private BigDecimal chargingCapacity;
+
+ @ApiModelProperty(value = "充电功率")
+ @TableField("charging_power")
+ private BigDecimal chargingPower;
@ApiModelProperty(value = "充电开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
--
Gitblit v1.7.1