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

shenyijian

2024-06-24 7d44d7a2a9ee8f55e911d678d78ff25f047cab4d

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java

@@ -630,7 +630,7 @@
            stResRainfall.setDrp(attResWithRainfall.getRainfall());
            stResRainfall.setFileName(attResWithRainfall.getFileName());
            stResRainfall.setDayIndex(dayIndex);
            stResRainfall.setCreateTime(System.currentTimeMillis());
            stResRainfall.setCreateTime(new Date());
            stResRainfalls.add(stResRainfall);
         }
      }