fix: 冲突

cloudroam

2024-10-23 8c469898c0a71224e17780696d47581de47c9ed7

 src/main/java/com/mzl/flower/mapper/wallet/WalletWithdrawRecordMapper.java

@@ -1,7 +1,13 @@
package com.mzl.flower.mapper.wallet;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.dto.request.wallet.QueryWalletDTO;
import com.mzl.flower.dto.response.member.MemberVO;
import com.mzl.flower.dto.response.wallet.WalletWithdrawRecordVO;
import com.mzl.flower.entity.wallet.WalletWithdrawRecordDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.List;

/**
 * <p>
@@ -13,4 +19,5 @@
 */
public interface WalletWithdrawRecordMapper extends BaseMapper<WalletWithdrawRecordDO> {

    List<WalletWithdrawRecordVO> queryPage(QueryWalletDTO queryWalletDTO, Page page);
}