From a85ab71180fdcb02b3cae304ebc96bb2ca12423c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 01 十一月 2024 17:24:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 6 +++++-
1 files changed, 5 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 0202131..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")
@@ -204,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