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

liyong

昨天 7558d3cb61282e41e27f85f56e829c6e6409f66d

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