Merge branch 'master' into wangfy-dev

wfy

2021-09-18 0417d31de9980cbc1735daffffb308d050ce35b4

 java110-utils/src/main/java/com/java110/utils/util/DateUtil.java

@@ -433,6 +433,7 @@
        return dateStr;
    }


    public static int getYear() {
        Date date = getCurrentDate();
        Calendar calendar = Calendar.getInstance();