Merge remote-tracking branch 'origin/master'

jiangping

2024-11-25 f04e52845f3897d92fd286c6d1efa62f8e8f25a4

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

@@ -3055,6 +3055,18 @@
        calendar.add(Calendar.DATE, days);//
        return calendar.getTime();
    }
    public static Date addYearToDate(Date date, int yeas) {
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(date);
        calendar.add(Calendar.YEAR, yeas);//
        return calendar.getTime();
    }
    public static Date addMonthToDate(Date date, int num) {
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(date);
        calendar.add(Calendar.MONTH, num);//
        return calendar.getTime();
    }

    public static String afterDateToStr(Integer days){
        Date date = new Date();