Merge remote-tracking branch 'origin/dev_tide' into dev_tide

liding

7 天以前 1284fb157043e488aa1794d8f1b64ebf18aa5147

 src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java

@@ -32,7 +32,7 @@

    List getTopFiveList();

    List<MonthlyAmountDto> getAmountHalfYear();
    List<MonthlyAmountDto> getAmountHalfYear(Integer type);

    IPage<SalesLedger> selectSalesLedgerListPage(Page page, SalesLedgerDto salesLedgerDto);
}