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

无关风月

9 天以前 f135f2c8c08b16ac25a4e8e0398418ab3ce1e620

 ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/WithdrawOrderVO.java

@@ -39,7 +39,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date completeTime;

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

    @ApiModelProperty("订单金额")