Merge remote-tracking branch 'origin/master-v4' into master-v4

陶杰

2024-12-21 331c41ca7f21b81985ba23d60ec05c350d21daa8

 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);
}