From f2a57f2a9fa309f872d10c7fada992b63a0c0d5f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期日, 27 十月 2024 20:52:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 22 +++++++++++++++++++++-
1 files changed, 21 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 382ce1d..5c6b7a4 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
@@ -31,6 +31,9 @@
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.NONE)
private Long id;
+ @ApiModelProperty(value = "序号")
+ @TableField(exist = false)
+ private Integer xuhao;
@ApiModelProperty(value = "订单编号")
@TableField("code")
@@ -68,6 +71,7 @@
@ApiModelProperty(value = "站点 id")
@TableField("site_id")
private Integer siteId;
+
@ApiModelProperty(value = "停车场id")
@TableField("parking_lot_id")
@@ -158,6 +162,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 +181,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")
@@ -188,7 +208,7 @@
private LocalDateTime refundTime;
@ApiModelProperty(value = "总电量")
@TableField("total_electricity")
- private BigDecimal totalElectricity;// 总电量
+ private BigDecimal totalElectricity;
@ApiModelProperty(value = "支付时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
--
Gitblit v1.7.1