From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java b/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
index b0faf43..0811768 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
@@ -77,9 +77,10 @@
     void updateBytime(@Param("coursePackagePayment") TCoursePackagePayment coursePackagePayment);
 
     List<Map<String, Object>> getStudentTotal(@Param("appUserIds") List<Integer> appUserIds, @Param("start") String start,
-                                              @Param("end") String end);
+                                              @Param("end") String end,@Param("packageIds")List<Integer> packageIds );
 
-    List<Map<String, Object>> pacQueryDto(PacQueryDto pacQueryDto);
+    List<Map<String, Object>> pacQueryDto(@Param("start") String start, @Param("end") String end,
+                                          @Param("storeIds") List<Integer> storeIds, @Param("name") String name);
 
     List<TCoursePackagePayment> listOne(@Param("ids") List<Integer> ids);
 

--
Gitblit v1.7.1