Merge branch 'test_screen' into 'master'

罗元桥

2021-06-17 a7b550f95172e29d71aa38dca45cacf7f31949b8

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

@@ -34,6 +34,8 @@

    public static DateTimeFormatter format_ymd_String = DateTimeFormatter.ofPattern("yyMMdd");

    public static SimpleDateFormat yyyyMM_format = new SimpleDateFormat("yyyy-MM");



    /**
@@ -718,12 +720,31 @@
        return date1.getTime();
    }

    public static Date parseDateYM(String str) {
        try {
            return yyyyMM_format.parse(str);
        } catch (ParseException e) {
            e.printStackTrace();
        }
        return null;
    }


    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);
    }




    public static void main(String[]args)throws Exception{