Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-02 c81e1267ee71da9bbf345ab2788deb3a65dbcd8c

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java

@@ -122,6 +122,10 @@
    @ApiModelProperty(value = "充值支付第三方流水号")
    @TableField("recharge_serial_number")
    private String rechargeSerialNumber;
    
    @ApiModelProperty(value = "剩余金额（用于前端展示）")
    @TableField("residual_amount")
    private BigDecimal residualAmount;

    @ApiModelProperty(value = "订单金额(总金额)")
    @TableField("order_amount")
@@ -181,6 +185,5 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("pay_time")
    private LocalDateTime payTime;


    
}