黄嘉阳 / iot-platform-server

# Conflicts:
#   server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderRealTimeServiceImpl.java