Merge branch 'dev' into local-slave

# Conflicts:
#	nb-admin/pom.xml
#	nb-admin/src/main/resources/application-dev.yml
#	nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/common/BusDeviceRunningEntity.java
#	nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicAnalRecordResult.java

nb-service/iot-service/src/main/java/com/nb/aliyun/service/consumer/NBAndFourGConsumerGroupService.java

@@ -196,6 +196,7 @@ public class NBAndFourGConsumerGroupService extends AbstractAliConsumer {
             }
             hospitalLog.setSuccess(true);
         } catch (Exception e) {
+            e.printStackTrace();
             hospitalLog.setSuccess(false);
             hospitalLog.setMessage(ExceptionUtil.getExceptionMsg(e));
             log.error("阿里云数据【{}】数据处理失败 ", JSONUtil.toJsonStr(message), e);