Merge remote-tracking branch 'origin/master'

zengh

2022-07-09 d48d6e9bb0bb48f8338798d8a2cba60396e16698

 src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java

@@ -62,6 +62,15 @@
   }

   @Override
   public Map<String, String> statisticsStock(String year,String deptId) {
      return baseMapper.statisticsStock(year,deptId);
   }
   @Override
   public List<Map<String, Double>> statisticsYield(String year,String deptId) {
      return baseMapper.statisticsYield(year,deptId);
   }

   @Override
   public boolean stockCompare(double sale,String id) {
      return baseMapper.stockCompare(sale,id);
   }