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

无关风月

4 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

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

@@ -34,7 +34,7 @@
    @ApiModelProperty("订单完成时间")
    private Date completeTime;

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

}