Merge remote-tracking branch 'origin/master'

jiangping

2024-05-21 cd28a4dad12746d50087ad60266a2ef0f30c3143

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

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


    // -----------------------------------------------------------------------