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

@@ -123,6 +123,10 @@
    @TableField("recharge_serial_number")
    private String rechargeSerialNumber;

    @ApiModelProperty(value = "剩余金额（用于前端展示）")
    @TableField("residual_amount")
    private BigDecimal residualAmount;

    @ApiModelProperty(value = "订单金额(总金额)")
    @TableField("order_amount")
    private BigDecimal orderAmount;
@@ -182,11 +186,4 @@
    @TableField("pay_time")
    private LocalDateTime payTime;
    
    @ApiModelProperty(value = "累计服务费")
    @TableField("service_charge")
    private BigDecimal serviceCharge;
    
    @ApiModelProperty(value = "累计电费")
    @TableField("electrovalence")
    private BigDecimal electrovalence;
}