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

cloudroam

2024-12-29 a02bed07c8281ae0fda850921eb7443393c5fb0c

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