Merge remote-tracking branch 'origin/master'

zengh

2022-08-01 daa6dce26ec80c58a0013b73c44a409a96f4cfc7

 src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java

@@ -39,7 +39,7 @@
    * @param sale
    * @return
    */
   List<SaleVO> selectSalePage(IPage page, SaleVO sale);
   List<SaleVO> selectSalePage(IPage page, @Param("sale") SaleVO sale);
   Map<String, String> selctSaletCount(String farmId);
   List<Map<Object,String>> selctSaletZ(@Param("sale") SaleVO sale);