From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceToBillService.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceToBillService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceToBillService.java
index e87d9ad..79150fd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceToBillService.java
+++ b/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);
}
+
--
Gitblit v1.7.1