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

huanghongfa

2021-06-17 ce4b6a8e4c11a869f5707eef053488c62fb97eed

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

@@ -33,6 +33,8 @@

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

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



    /**
@@ -691,6 +693,16 @@
        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);