Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb

tangxiaobao

2021-07-14 c64da5152d32c366eecfb20b3fdc023be1d27681

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

@@ -32,6 +32,8 @@

    public static SimpleDateFormat ymdhms_format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

    public static SimpleDateFormat ymdhm_format = new SimpleDateFormat("yyyy-MM-dd HH:mm");

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

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