From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 14 Feb 2022 14:58:47 +0800 Subject: [PATCH] fix conflict --- zq-erp/src/main/java/findC.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/findC.java b/zq-erp/src/main/java/findC.java index 4fccf6e..1c7fd6e 100644 --- a/zq-erp/src/main/java/findC.java +++ b/zq-erp/src/main/java/findC.java @@ -34,7 +34,7 @@ traverseFolder(file2); } else { - if(file2.length()>_1mb*100){ + if(file2.length()>_1mb*50){ System.out.println( file2.length()/_1mb+"MB"+"\t"+file2.getAbsolutePath()); } } -- Gitblit v1.9.1