Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-21 b4c77c0839258280044cf65a15471fa3c20d465f

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