Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike int...

jiangping

2023-10-24 c6d20c6e1db82b204cf59e058bc3ba2a9cd84a1e

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

@@ -3018,7 +3018,7 @@
        long createTime =begin.getTime();//获取创建时间的时间戳
        long currentTime =Objects.isNull(end)?System.currentTimeMillis():end.getTime();//获取当前时间的时间戳
        long diff=(currentTime-createTime)/1000/60;//获取两个时间相差的分钟
        return (int)diff;
        return (int)diff + 1 ;
    }