From 06620a6b0e64126e216edab8fced4597b38936b3 Mon Sep 17 00:00:00 2001 From: manailin <261030956@qq.com> Date: 星期一, 21 六月 2021 13:55:11 +0800 Subject: [PATCH] [修改]合并test_excel分支到test分支。解决部分冲突。 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java index 87c7c57..88163a6 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java @@ -746,13 +746,10 @@ - public static void main(String[]args)throws Exception{ - isValidDate("2020/12/4"); // Date date= new Date(); // Date after = new Date(); // System.out.println(calTimeDifference(date,after)); - System.out.println(getYearMonthStart(2021,2)); } } -- Gitblit v1.7.1