fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

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

@@ -340,6 +340,16 @@
        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        return df.format(time);
    }
    /**
     * localdatetime转为字符串
     *
     * @param time localdatetime
     * @return 字符串
     */
    public static String localDateTimeToStringYear(LocalDateTime time) {
        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
        return df.format(time);
    }

    /**
     * Date转为LocalDateTime