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

CeDo

2021-06-16 364ba784afea825f761197981f6e68f03ee9382e

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

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

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