Merge remote-tracking branch 'origin/master'

doum

8 天以前 3c5771460c280139a53e0c451e6ceb8742680b5c

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

@@ -2057,7 +2057,7 @@
     */
    public static String getCurrDateTime() {
        Timestamp date = new Timestamp(System.currentTimeMillis());
        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        return formatter.format(date);
    }
    public static String getCurrDateTimeShort() {