fix conflect

Helius

2021-11-17 792a502dd95cadccbef8121673e6b5059a2c3550

 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());
                        }
                    }