Merge remote-tracking branch 'origin/master'

luodangjia

2024-09-02 533c26ca01cee2e0883cd43ad808bc3267937db8

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

@@ -122,7 +122,7 @@
    @ApiModelProperty(value = "充值支付第三方流水号")
    @TableField("recharge_serial_number")
    private String rechargeSerialNumber;
    

    @ApiModelProperty(value = "剩余金额（用于前端展示）")
    @TableField("residual_amount")
    private BigDecimal residualAmount;
@@ -185,5 +185,4 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("pay_time")
    private LocalDateTime payTime;
    
}