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/service/impl/TbResAndDykeAllServiceImpl.java

@@ -22,7 +22,7 @@
   private TbResAndDykeAllMapper tbResAndDykeAllMapper;

   @Override
   public List<ResAndDykeAll> getStatisticsTable(String code) {
      return tbResAndDykeAllMapper.getStatisticsTable(code) ;
   public List<ResAndDykeAll> getStatisticsTable(String code,String year) {
      return tbResAndDykeAllMapper.getStatisticsTable(code,year) ;
   }
}