Merge branch 'devPartner' of http://139.186.142.91:10010/r/productDev/parkB...

MrShi

2023-12-12 9088209cdd7e3158d2a04caae05e6726ba3b3ad6

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

@@ -2309,7 +2309,7 @@
    }
    public static Date getDateFromString2(String strDate) {
        if (StringUtils.isEmpty(strDate)) {
            return new Date(System.currentTimeMillis());
            return null;
        }
        try {
            return sdfLongTimePlus.parse(strDate);