Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-14 0a12bfc2e9594345a0a6cf136bcf234c62450d9d

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