Merge remote-tracking branch 'remotes/origin/dev_user_grid_work_2_jinan' into develop

# Conflicts:
#	epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java

@@ -190,6 +190,8 @@ public class SystemMessageServiceImpl implements SystemMessageService {
                 break;
             case SystemMessageType.USER_PATROL_START:
             case SystemMessageType.USER_PATROL_STOP:
+            case SystemMessageType.PATROL_ROUTINE_WORK_ADD:
+
                 topic = TopicConstants.PATROL;
                 break;
             case SystemMessageType.PROJECT_ADD:
@@ -220,7 +222,7 @@ public class SystemMessageServiceImpl implements SystemMessageService {
                 topic = TopicConstants.EPMET_HEART;
                 break;
             default:
-                logger.info("getTopicByMsgType default topic:{}", msgType);
+                logger.warn("getTopicByMsgType default msgType:{}", msgType);
         }
         return topic;
     }