From 818cb6acf1167a6ef5f9d1fbf3fb2df390ddf037 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 26 十月 2024 11:56:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
index b6cd84b..3e5d867 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
@@ -80,6 +80,14 @@
@ApiModelProperty(value = "总费用")
@TableField("order_amount")
private BigDecimal orderAmount;
+
+ @ApiModelProperty(value = "支付金额")
+ @TableField("payment")
+ private BigDecimal payment;
+
+ @ApiModelProperty(value = "支付方式")
+ @TableField("payType")
+ private String payType;
@ApiModelProperty(value = "状态（1=已进场，2=已出场，3=已缴费出场）")
@TableField("status")
--
Gitblit v1.7.1