From 71d23d994445025d9eaf18c86bbdcf82f632bf83 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 16 六月 2025 09:49:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingBillMapper.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingBillMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingBillMapper.java
index c93a20a..faa0889 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingBillMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingBillMapper.java
@@ -26,5 +26,18 @@
             @Param("req") ChargingListQuery dto,
             @Param("startTime1")String startTime1,
             @Param("startTime2")String startTime2);
+    List<ChargingBillListVO> chargingBillListNoLimit(
+            @Param("req") ChargingListQuery dto,
+            @Param("startTime1")String startTime1,
+            @Param("startTime2")String startTime2);
+    List<ChargingBillListVO> chargingBillList1(
+            @Param("pageInfo") PageInfo<ChargingBillListVO> pageInfo,
+            @Param("req") ChargingListQuery dto,
+            @Param("startTime1")String startTime1,
+            @Param("startTime2")String startTime2);
 
+    List<ChargingBillListVO> chargingBillList1Nolimt(
+            @Param("req") ChargingListQuery dto,
+            @Param("startTime1")String startTime1,
+            @Param("startTime2")String startTime2);
 }

--
Gitblit v1.7.1