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

jiangping

2024-06-21 69c2b50ded530c6bc003c6ddbeaca786d7823270

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

@@ -354,6 +354,8 @@
        }
    }



    /**
     * Descrption:取得当前日期,格式为:yyyy-MM-dd HH:mm:ss
     *
@@ -3034,6 +3036,10 @@
        return DateToString(date, "yyyyMMddHHmmss");
    }

    public static String getLongDateTime(Date date) {
        return DateToString(date, "yyyy-MM-dd HH:mm:ss");
    }

    public static String DateToString(Date date, String dateStyle) {
        String dateString = null;
        if (dateStyle != null) {
@@ -3151,7 +3157,7 @@


    public static void main(String[] args) throws Exception{
        System.out.println(DateUtil.getPlusTime(new Date()));;
        System.out.println(DateUtil.getLongDateTime(new Date()));;
    }

    /**