提交合并冲突

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRequestFundsDetailServiceImpl.java

@@ -82,14 +82,4 @@ public class AccountRequestFundsDetailServiceImpl extends ServiceImpl<AccountReq
         return baseMapper.listByAccountRequestFundsId(accountRequestFundsId);
     }
 
-    /**
-     * 获取到请款明细信息
-     * @param eq
-     * @return
-     */
-    @Override
-    public List<AccountRequestFundsDetail> getList(LambdaQueryWrapper<AccountRequestFundsDetail> eq) {
-        return baseMapper.getList(eq);
-    }
-
 }