Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-12 be9da335cb28e12e1439c24e4596f069e342d83f

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

@@ -50,5 +50,5 @@
    */
   List<Map<Object,String>> selectMarketCirculate(@Param("sale") SaleVO sale);

   List<Map<Object,String>> selectMarketDistrict(String farmId);
   List<Map<Object,String>> selectMarketDistrict(String farmId,String startTime,String endTime);
}