From 51eac60f5d04af43f93590ad2219f9bdda313745 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 25 十二月 2024 11:11:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/mapper/payment/OrderSettlementMapper.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/mapper/payment/OrderSettlementMapper.java b/src/main/java/com/mzl/flower/mapper/payment/OrderSettlementMapper.java
index 689e2c3..e77215a 100644
--- a/src/main/java/com/mzl/flower/mapper/payment/OrderSettlementMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/payment/OrderSettlementMapper.java
@@ -15,5 +15,7 @@
public interface OrderSettlementMapper extends BaseMapper<OrderSettlement> {
List<OrderSettlementListDTO> selectSettlementList(Page page, @Param("condition") OrderSettlementQueryDTO dto);
+ List<OrderSettlementListDTO> selectSettlementListInfo(Page page, @Param("condition") OrderSettlementQueryDTO dto);
+
BigDecimal getUserIncome(@Param("userId") String userId);
}
--
Gitblit v1.9.3