Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-09-07 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java

@@ -758,6 +758,12 @@
        return instance.get(Calendar.MONTH);
    }

    public static int getYear(Date date) {
        Calendar instance = Calendar.getInstance();
        instance.setTime(date);
        return instance.get(Calendar.YEAR);
    }

    public static boolean before(Date start, Date end) {
        Calendar date1 = Calendar.getInstance();
        date1.setTime(start);
@@ -883,6 +889,5 @@
        // Date after = new Date();
        // System.out.println(getFirstDayOfMonthString());
        // System.out.println(getDayOfMonthString());

    }
}