Merge remote-tracking branch 'origin/master'

jiangping

2024-05-20 dc22358d8624d3f5a2c27ee6c27e0bdbfe705fe9

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

@@ -2849,9 +2849,9 @@

    public static void main(String[] args) {
        try {
            Date date = getISO8601DateByStr("2024-04-15T07:46:36.014+08:00");
            Date date1 = getISO8601DateByStr("2024-06-14T08:46:36.014+08:00");
            System.out.println(daysBetweenDates11(date1,date)+1);
//            Date date = getISO8601DateByStr("2024-04-15T07:46:36.014+08:00");
//            Date date1 = getISO8601DateByStr("2024-06-14T08:46:36.014+08:00");
            System.out.println(DateUtil.afterMinutesDate(-5));

        } catch (Exception ex) {
            ex.printStackTrace();
@@ -3108,6 +3108,18 @@
    }

    /**
     * X 分钟后时间
     * @param minutes
     * @return
     */
    public static Date afterMinutesDate(Date date,Integer minutes){
        Calendar cal = Calendar.getInstance();
        cal.setTime(date);
        cal.add(Calendar.MINUTE,minutes);
        return cal.getTime();
    }

    /**
     * LocalDateTime to date
     * @param now
     * @return