Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

2025-07-25 c897a68da55d63439826d37be3cb13c5c0f95a48

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderPayment.java

@@ -78,6 +78,11 @@
    @TableField("pay_money")
    private BigDecimal payMoney;
    /**
     * 手续费
     */
    @TableField("fee_amount")
    private BigDecimal feeAmount;
    /**
     * 失效时间
     */
    @TableField("time_expire")