Merge remote-tracking branch 'origin/master'

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/HashCompareUtil.java

@@ -19,13 +19,22 @@ public class HashCompareUtil {
                 n=n + 1;
             }
         }
-        return String.format("%.2f", 100.0 - n/64.0 * 100.0);
+        String formattedResult="";
+        double c=100.0 - n/64.0 * 100.0;
+        if (c % 1 == 0) {
+            // 如果是整数，将小数位去除
+            formattedResult = String.valueOf((int) c);
+        } else {
+            // 如果不是整数，保留两位小数
+            formattedResult = String.format("%.2f", c);
+        }
+        return formattedResult;
     }
 
 
     public static void main(String[] args) {
         String a="1111111100000111000110110001101100110011001100000000000011110001";
-        String b="1011111100000111000110110001101100110011001100000000000011110001";
+        String b="1111111100000111000110110001101100110011001100000000000011110001";
         long start = System.currentTimeMillis();
         int ss=0;
 //        for(int i=0;i<5000000;i++){