Merge remote-tracking branch 'origin/master'

jiangping

2024-12-05 16217be9c85f95cb236e639da6e546bb38cdc53d

 server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -2851,6 +2851,7 @@
//            System.out.println(DateUtil.afterMinutesDate(-5));


          System.out.println(DateUtil.getPlusTime2( new Date() ));
          System.out.println(DateUtil.getPlusTime2(addMonthToDate(new Date(),3)));

//            Date startTime = DateUtil.StringToDate("2024-05-01 08:00:00" ,"yyyy-MM-dd HH:mm:ss");
@@ -3065,6 +3066,7 @@
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(date);
        calendar.add(Calendar.MONTH, num);//

        return calendar.getTime();
    }