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

jiangping

2023-10-13 d800ed8f4f9c3a6dbd1b9833afc36a6a768495b9

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

@@ -299,7 +299,7 @@
            nowDate = sdfShort.format(date);
            return nowDate;
        } catch (Exception e) {
            throw e;
           return  null;
        }
    }