From 7ef83f0708e9d04c2536d7d0ad453073d42f680d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 25 十月 2024 11:27:27 +0800
Subject: [PATCH] 合并代码

---
 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