Merge branch 'master' into dev

wangzhengquan

2021-01-18 fb3f4f606659af9cbf10b0b6710fb80fcaec5627

 src/socket/shm_mod_socket.cpp

@@ -62,7 +62,7 @@
*/
int ShmModSocket::recvfrom(void **buf, int *size, int *key) {
   int rv =  shm_recvfrom(shm_socket, buf, size, key, NULL, 0);
   // logger->error(rv, "ShmModSocket::recvfrom failed!");
   
  return rv;
}