fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceToBillService.java

@@ -2,6 +2,14 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.TInvoiceToBill;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TInvoice;
import com.ruoyi.system.model.TInvoiceToBill;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.query.TInvoiceQuery;
import com.ruoyi.system.query.TInvoiceToBillQuery;

import java.util.List;

/**
 * <p>
@@ -13,4 +21,6 @@
 */
public interface TInvoiceToBillService extends IService<TInvoiceToBill> {

    List<TInvoiceToBill> makeQuery(TInvoiceToBillQuery query);
}