Merge remote-tracking branch 'origin/master'

jiangping

2025-04-10 9f7777c83f2d07c8d83c506ab2a13bc543f47de9

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

@@ -594,12 +594,12 @@
     * @return String
     * @throws Exception
     */
    public static String getNowMonth() throws Exception {
    public static Integer getNowMonth() throws Exception {
        String nowMonth = "";
        try {
            String strTemp = getNowLongTime();
            nowMonth = strTemp.substring(4, 6);
            return nowMonth;
            return Integer.valueOf(nowMonth);
        } catch (Exception e) {
            throw e;
        }
@@ -2928,8 +2928,9 @@
//            System.out.println(DateUtil.afterMinutesDate(-5));


            System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
//            System.out.println(DateUtil.getBeforMonthStr(new Date(),12));
//            List<String> s = DateUtil.getDayByMonth();
//            System.out.println(getPlusTime2(DateUtil.addMonthToDate(new Date(),-1)));
            System.out.println(DateUtil.getNowMonth());

//            List<Date> list =getThisMonthDateList();
//            for(Date d :list){
@@ -3236,6 +3237,14 @@
        return cal.getTime();
    }

    public static Date afterHoursDate(Date date,Integer hours){
        Calendar cal = Calendar.getInstance();
        cal.setTime(date);
        cal.add(Calendar.HOUR,hours);
        return cal.getTime();
    }


    /**
     * LocalDateTime to date
     * @param now