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

jiaosong

2023-11-07 5e1cfd9032785dbe6438c830acad294d346f2734

 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);