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

yaowanxin

20 小时以前 6f888b234148d1a4dbd1e6c28a8d9ed85ebfda09

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