Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-05 c564930d687e421e4e35d7fcafadc6d11ff23b9c

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

@@ -40,6 +40,7 @@
    @TableField("refund_code")
    private String refundCode;


    @ApiModelProperty(value = "退款金额")
    @TableField("refund_amount")
    private BigDecimal refundAmount;
@@ -106,4 +107,6 @@
    private String orderId;
    @TableField(exist = false)
    private String userId;
    @TableField(exist = false)
    private String uid;
}