Merge remote-tracking branch 'origin/develop' into dev/diagnoseNewType20210623

# Conflicts:
#	src/main/java/com/diagbot/process/PushProcess.java

src/main/java/com/diagbot/facade/PushFacade.java

@@ -166,6 +166,7 @@ public class PushFacade {
                 invokeParams.put("wordCrfDTO", wordCrfDTO);
                 invokeParams.put("pushNewVO", generatePushVo(wordCrfDTO, modelType));
                 pushDTO = DataFacade.get("pushAll", invokeParams, PushDTO.class);
+                debug.put("使用推送模型", modelType); // 输出调试信息
             } catch (Exception e) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "推送服务出错" + e.getMessage());
             }