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

zss

昨天 609dc04b7262c229653775015ecd4334f679589b

 src/main/java/com/ruoyi/sales/mapper/SalesLedgerProductMapper.java

@@ -40,4 +40,6 @@
    List<Map<String, Object>> selectRawMaterialPurchaseAnalysis();

    int selectProductCountByTypeAndDate(@Param("type") Integer type, @Param("startDate") String startDate, @Param("endDate") String endDate);

    BigDecimal selectRawMaterialExpense();
}