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

k94314517

2025-07-01 f7a3d41075e00498f7033475108c0bcd86cda733

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

@@ -94,10 +94,12 @@
    /**
     * 得出两个日期之间的间隔小时
     *
     * @param fromDate
     * @param fromDate 靠前的时间
     *            格式为yyyy-MM-dd
     * @param toDate
     * @param toDate  靠后的时间
     *            格式为yyyy-MM-dd
     *                DateUtil.getBetweenHours(DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss","2025-05-26 10:46:43"),
     *                 DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss","2025-05-26 07:41:43")) 返回 -2小时
     * @return int
     */
    public static long getBetweenHours(Date fromDate, Date toDate) {
@@ -3202,7 +3204,14 @@


    public static void main(String[] args) throws Exception{
        System.out.println(DateUtil.StringToDate("2025-05-16 13:49:40").getTime());
        System.out.println(DateUtil.DateToStr(
                DateUtil.afterDateByType(new Date(),1,-11),"yyyy-MM")
        );
//
//        System.out.println(DateUtil.getBetweenHours(DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss","2025-05-26 10:46:43"),
//                DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss","2025-05-26 07:41:43")));
//        ;

//        System.out.println(DateUtil.getLongDateTime(new Date()));;
    }