Merge branch '2.1' into 2.3

longz

2026-07-14 b50e57bf7e17d696ddb4e9785c909052da034ef4

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java

@@ -27,6 +27,10 @@
    private BigDecimal balanceIncome;
    @ApiModelProperty(value = "赠送费用")
    private BigDecimal balanceGiftIncome;
    @ApiModelProperty(value = "平台收入")
    private BigDecimal platformIncome;
    @ApiModelProperty(value = "合作商收入")
    private BigDecimal partnerIncome;
    @ApiModelProperty(value = "白名单用户退款金额")
    private BigDecimal whitelistRefundAmount;