Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

puzhibing

2024-03-12 032f7c07e272dae9a857ed76b480dc391dc4073f

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

@@ -150,7 +150,7 @@
     */
    public static Date parse(String date, String pattern) {
        try {
            if(Objects.nonNull(date)) {
            if (Objects.nonNull(date)) {
                return DateUtils.parseDate(date, pattern);
            }
        } catch (ParseException e) {
@@ -286,6 +286,7 @@
        Calendar cal = Calendar.getInstance();
        return cal;
    }

    /**
     * 毫秒转日期时间
     *