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

无关风月

3 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Order.java

@@ -132,7 +132,7 @@
    @TableField("subsidy")
    private BigDecimal subsidy;

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