解决冲突

mg

2022-10-28 2d964c50c7ac6557e968328e5931006686c4cfbb

 ycl-common/src/main/java/com/ycl/utils/common/DateUtil.java

@@ -150,10 +150,6 @@
        return calendar.getTime();
    }

    public static void main(String[] args) throws ParseException {
        String date = "2021-08";
        System.out.println(getDate(date));
    }

    /**
     * 方法名: getDate