From a22ce57542c0ff54032f3a454eb22bace0b42d24 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 25 十月 2024 11:02:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingBillMapper.java |    5 +++++
 1 files changed, 5 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..c9b7bae 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,10 @@
             @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);
 
 }

--
Gitblit v1.7.1