Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResAndDykeController.java

@@ -26,8 +26,8 @@
   private ITbResAndDykeAllService tbProjectAllService;

   @GetMapping("/getStatistics")
   public R getStatistics(String code){
      List<ResAndDykeAll> list = tbProjectAllService.getStatisticsTable(code);
   public R getStatistics(String code,String year){
      List<ResAndDykeAll> list = tbProjectAllService.getStatisticsTable(code,year);
      return R.data(list);
   }