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

zss

昨天 afacb4a693c3b7e40ccdd55bc403850709ff8a34

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