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/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusDeviceService.java

@@ -195,7 +195,9 @@ public class LocalBusDeviceService extends BaseService<BusDeviceMapper, BusDevic
         }else {
             // 添加设备
             try {
-                entity.setTenantId(Constants.DefaultHospital);
+                if (StrUtil.isBlank(entity.getTenantId())) {
+                    entity.setTenantId(Constants.DefaultHospital);
+                }
                 return this.save(entity);
             }catch (Exception e){
                 log.error("新增设备失败，【{}】",ExceptionUtil.getExceptionMsg(e));