From bb18fbb5291e13b0545b90e8d8641c8392f7a112 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期三, 06 十一月 2024 16:25:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java | 1 + 1 files changed, 1 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..ad43d21 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 @@ -26,6 +26,7 @@ private Integer status; @ApiModelProperty("订单金额") private Double orderAmount; + private Double rechargeAmount; @ApiModelProperty("支付金额") private Double paymentAmount; @ApiModelProperty("下单时间") -- Gitblit v1.7.1