Merge remote-tracking branch 'origin/master'

nickchange

2023-11-15 331ae50b1cdcb31a4a0c182abb82aec5c1b12f83

 cloud-server-activity/src/main/java/com/dsh/activity/util/DateTimeHelper.java

@@ -244,7 +244,6 @@
        try {
            return parseToDate(formatDateTimetoString(getSystemDate(), fmtstr));
        } catch (Exception e) {
            // TODO Auto-generated catch block
            e.printStackTrace();
            return getSystemDate();
        }