fix: 冲突

cloudroam

2024-10-23 8c469898c0a71224e17780696d47581de47c9ed7

 src/main/java/com/mzl/flower/dto/response/wallet/WalletWithdrawRecordVO.java

@@ -36,7 +36,7 @@
    private LocalDateTime approveTime;

    @ApiModelProperty(value = "审核状态（待审核、已通过、已拒绝）")
    private Integer approveState;
    private String approveState;

    @ApiModelProperty(value = "不通过原因")
    private String rejectReason;