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/TOrderBillService.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderBillService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderBillService.java
index 8c2e80d..7814005 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderBillService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderBillService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.TOrderBill;
+import java.util.List;
+
/**
* <p>
* 订单表与账单的关联表 服务类
@@ -13,4 +15,6 @@
*/
public interface TOrderBillService extends IService<TOrderBill> {
+ List<TOrderBill> getByOrderNo(String orderNo);
+
}
--
Gitblit v1.7.1