fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceToBillServiceImpl.java

New file
@@ -0,0 +1,31 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.mapper.TInvoiceToBillMapper;
import com.ruoyi.system.model.TInvoiceToBill;
import com.ruoyi.system.query.TInvoiceToBillQuery;
import com.ruoyi.system.service.TInvoiceToBillService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
 * 账单开票中间表 服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-10
 */
@Service
public class TInvoiceToBillServiceImpl extends ServiceImpl<TInvoiceToBillMapper, TInvoiceToBill> implements TInvoiceToBillService {

    @Override
    public List<TInvoiceToBill> makeQuery(TInvoiceToBillQuery query) {
        LambdaQueryWrapper<TInvoiceToBill> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(null != query.getInvoiceId(),TInvoiceToBill::getInvoiceId,query.getInvoiceId())
                .eq(null != query.getBillId(),TInvoiceToBill::getBillId,query.getBillId());
        return this.baseMapper.selectList(queryWrapper);
    }
}