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

CeDo

2021-06-10 c7af0867cc62c363221ace3e1afaac8dd38df3a2

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

@@ -630,6 +630,18 @@
        return dateString;
    }

    /**
     * 获取当前月第一天
     * @return
     */
    public static Date getFirstDayOfMonth() {
        Calendar cal = Calendar.getInstance();
        cal.add(Calendar.MONTH,0);
        int actualMinimum = cal.getActualMinimum(Calendar.DAY_OF_MONTH);
        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY),actualMinimum,00,00,00);
        return cal.getTime();
    }




@@ -638,6 +650,7 @@
//        Date date= new Date();
//        Date after = new Date();
//        System.out.println(calTimeDifference(date,after));
        System.out.println(getFirstDayOfMonth());

    }
}