Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-31 d1d7df6417a76d481e654c96b2db34e4fbab88ea

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderInfoDto.java

@@ -24,6 +24,7 @@
    private LocalDateTime payTime;
    @ApiModelProperty("退款金额")
    private BigDecimal refundAmount;
    private BigDecimal rechargeAmount;


}