Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-26 17cfbc75dc326f3e5963ee17c99d6516497f8cf1

 src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java

@@ -74,8 +74,8 @@
      return baseMapper.selectMarketCirculate(sale);
   }
   @Override
   public List<Map<Object, String>> selectMarketDistrict(String farmId) {
      return baseMapper.selectMarketDistrict(farmId);
   public List<Map<Object, String>> selectMarketDistrict(String farmId,String startTime,String endTime) {
      return baseMapper.selectMarketDistrict(farmId,startTime,endTime);
   }

}