fix: 冲突

cloudroam

2024-10-23 8c469898c0a71224e17780696d47581de47c9ed7

 src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java

@@ -43,7 +43,7 @@
     * 提现状态
     */
    @ApiModelProperty(value = "提现状态（提现中、提现成功、提现失败）")
    private Integer withdrawState;
    private String withdrawState;

    /**
     * 提现方式
@@ -66,8 +66,8 @@
    /**
     * 审核状态
     */
    @ApiModelProperty(value = "审核状态（待审核、审核通过、审核不通过）")
    private Integer approveState;
    @ApiModelProperty(value = "审核状态（待审核、已通过、已拒绝）")
    private String approveState;

    /**
     * 不通过原因