fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -1,5 +1,7 @@
package com.ruoyi.system.service;

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;
@@ -18,6 +20,7 @@
 * @since 2025-02-10
 */
public interface TInvoiceToBillService extends IService<TInvoiceToBill> {

    List<TInvoiceToBill> makeQuery(TInvoiceToBillQuery query);
}