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

无关风月

2025-06-26 d2731c217410c70aaf46c016a572d836e9c1d91e

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderRequest.java

@@ -100,7 +100,7 @@
    @ApiModelProperty("订单补贴金额")
    private BigDecimal subsidy;

    @ApiModelProperty("是否已提现(0:未提现，1:已提现)")
    @ApiModelProperty("是否已提现(0:未提现，1:审核中 2审核通过 3:已确认收款)")
    private Integer isWithdrawal;

    @ApiModelProperty("详细地址")