Merge remote-tracking branch 'origin/test_screen' into test_screen

huanghongfa

2021-06-17 ad5f1d1056ba118f4ed7c769a8cbbe1e6690e695

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

@@ -684,6 +684,26 @@
        return cal.getTime();
    }

   public static Date getDateM(Date start, int min) {
        Calendar date1 = Calendar.getInstance();
        date1.setTime(start);
        date1.add(Calendar.MONTH, min);
        return date1.getTime();
    }

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

    public static boolean before(Date start, Date end){
        Calendar date1 = Calendar.getInstance();
        date1.setTime(start);
        Calendar date2 = Calendar.getInstance();
        date2.setTime(end);
        return date1.before(date2);
    }