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

liyong

昨天 217f8ee47bb19f8e154d4012dbe232f0d7af3a3d

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