Merge branch 'test_excel610' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

manailin

2021-06-16 8ec616a63a35001175fc2a16f5442404562117fa

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

@@ -616,6 +616,13 @@
    }


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