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

rk

9 天以前 3d46f89ff6c600f60d97f4541443540be20460c1

 server/services/src/main/java/com/doumee/core/utils/Date.java

@@ -41,4 +41,15 @@
        calendar.set(Calendar.MILLISECOND, 0);
        return calendar.getTime();
    }

    public java.util.Date getDayOfEnd (java.util.Date date) {
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(date);
        calendar.set(Calendar.DATE, calendar.get(Calendar.DATE));
        calendar.set(Calendar.HOUR_OF_DAY, 23);
        calendar.set(Calendar.MINUTE, 59);
        calendar.set(Calendar.SECOND, 59);
        calendar.set(Calendar.MILLISECOND, 0);
        return calendar.getTime();
    }
}