Merge remote-tracking branch 'origin/master'

detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java

@@ -1076,14 +1076,20 @@ public class SocketDevResponseService {
         int length = arrays.get(0).length;
         Integer[] maxArray = new Integer[length];
         for (int i = 0; i < length; i++) {
-            int maxValue = Integer.MIN_VALUE;
+            int maxValue = -1;
             for (Integer[] array : arrays) {
                 int value = array[i];
-                if (value > maxValue) {
-                    maxValue = value;
+                if(value != 4) {
+                    if (value > maxValue) {
+                        maxValue = value;
+                    }
                 }
             }
-            maxArray[i] = maxValue;
+            if(maxValue == -1){
+                maxArray[i] = 4;
+            }else {
+                maxArray[i] = maxValue;
+            }
         }
         return maxArray;
     }