Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-09 b5ae703a499b97fd83dd9a7b67a10a7b8157df5f

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

@@ -85,7 +85,9 @@
        }
    }


    /**
     * 转换Date去掉毫秒
     */
    public static final Date covertTime(Date date)  {
        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        Timestamp now = new Timestamp(date.getTime());