Merge remote-tracking branch 'origin/master'

Administrator

2023-08-25 7f21d4f22ec711d6aa89900b07e0b5ac31dbac42

 ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -204,7 +204,7 @@
        // 获得两个时间的毫秒时间差异
        long diff = endDate.getTime() - nowDate.getTime();
        // 计算差多少秒//输出结果
        long sec = diff % nd % nh % nm / ns;
        long sec = diff/ ns;
        return sec;
    }
}