Merge remote-tracking branch 'origin/master'

zengh

2022-07-13 3d4cbf0b3534da14db4a57f8bdafe2125b3b8678

 src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java

@@ -203,7 +203,7 @@

      //采收数量统计
      Map map = new HashMap();
      Map<String, String> cssum = farmProductStockService.statisticsStockMonth(year, deptId);
      List<Map<String, String>> cssum = farmProductStockService.statisticsStockMonth(year, deptId);
      //加工产品数量统计
      Map<String, String> jgsum = null;