Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike int...

jiangping

2023-10-08 35b0b9d26bac17adbc22c419c5d95357611d359d

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

@@ -2298,6 +2298,16 @@
            return new Timestamp(System.currentTimeMillis());
        }
    }
    public static Date getDateFromString2(String strDate) {
        if (StringUtils.isEmpty(strDate)) {
            return new Date(System.currentTimeMillis());
        }
        try {
            return sdfLongTimePlus.parse(strDate);
        } catch (Exception ex) {
           return  null;
        }
    }

    // -----------------------------------------------------------------------
    public static Date parseFromFormats(String aValue) {