Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/sql记录

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/contacts/ContactsService.java

@@ -178,7 +178,7 @@ public class ContactsService {
                result1.add(map);
            }
        }
        result1.addAll(result1);
        result.addAll(result1);
        return result;
    }