From 0bc3e6364efb4f6e16585c93afb84a6b1830feb5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 21 七月 2025 14:41:07 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
index 4b5a40a..cfc9ff3 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
@@ -13,6 +13,8 @@
     private String id;
     @ApiModelProperty("1充电订单2购物订单3vip订单4停车订单")
     private Integer type;
+    @ApiModelProperty("站点id")
+    private Integer siteId;
     @ApiModelProperty("订单编号")
     private String code;
     @ApiModelProperty("订单标题")
@@ -26,6 +28,7 @@
     private Integer status;
     @ApiModelProperty("订单金额")
     private Double orderAmount;
+    private Double rechargeAmount;
     @ApiModelProperty("支付金额")
     private Double paymentAmount;
     @ApiModelProperty("下单时间")

--
Gitblit v1.7.1