Merge remote-tracking branch 'origin/glccwcs' into glccwcs

Administrator

4 天以前 aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2

 src/main/java/com/zy/common/utils/CollectionUtils.java

@@ -8,10 +8,10 @@
public class CollectionUtils {

    public static boolean equals(Set<?> set1, Set<?> set2) {
        if(set1 == null || set2 ==null){
        if (set1 == null || set2 == null) {
            return false;
        }
        if(set1.size()!=set2.size()){
        if (set1.size() != set2.size()) {
            return false;
        }
        return set1.containsAll(set2);