Merge remote-tracking branch 'origin/master'

xuhy

6 天以前 1ec94c00e5c312818c9e1e3742ca838e60b7e5e7

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysOrderMapper.java

@@ -42,16 +42,16 @@
                                          @Param("startTime")String startTime,
                                          @Param("endTime")String endTime);

    List<ClinicSalesStatisticsGoodsTypeVO> supplierSalesStatisticsGoodsType(@Param("clinicId")String clinicId,
    List<ClinicSalesStatisticsGoodsTypeVO> clinicSalesStatisticsGoodsType(@Param("clinicId")String clinicId,
                                                                            @Param("startTime")String startTime,
                                                                            @Param("endTime")String endTime);

    List<ClinicSalesStatisticsGoodsCountVO> supplierSalesStatisticsGoodsCount(@Param("clinicId")String clinicId,
    List<ClinicSalesStatisticsGoodsCountVO> clinicSalesStatisticsGoodsCount(@Param("clinicId")String clinicId,
                                                                              @Param("startTime")String startTime,
                                                                              @Param("endTime")String endTime,
                                                                              @Param("goodsName")String goodsName);

    List<ClinicSalesStatisticsGoodsCountVO> supplierSalesStatisticsGoodsCountMonth(@Param("clinicId")String clinicId,
    List<ClinicSalesStatisticsGoodsCountVO> clinicSalesStatisticsGoodsCountMonth(@Param("clinicId")String clinicId,
                                                                                   @Param("startTime")String startTime,
                                                                                   @Param("endTime")String endTime,
                                                                                   @Param("goodsName")String goodsName);