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

ke

2024-05-13 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/util/MyDateUtils.java

@@ -24,8 +24,8 @@
      SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

      try {
         Date startDate = sdf.parse(StringUtil.format("{}-05-01",nowYear));
         Date endDate = sdf.parse(StringUtil.format("{}-11-01",nowYear));
         Date startDate = sdf.parse(StringUtil.format("{}-04-15",nowYear));
         Date endDate = sdf.parse(StringUtil.format("{}-10-15",nowYear));

         inSeason = today.after(startDate)&&today.before(endDate);
         return inSeason;