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/controller/BusAlarmController.java

@@ -35,8 +35,8 @@ public class BusAlarmController extends BaseCrudController<BusDeviceAlarmEntity,
     private final WsPublishUtils wsPublishUtils;
 
     @PostMapping("/cause/{id}")
-    @ApiOperation(value = "添加报警原因",notes = "权限：【bus:alarm:cause】")
-    @SaCheckPermission("bus:alarm:cause")
+    @ApiOperation(value = "添加报警原因",notes = "权限：【无】")
+//    @SaCheckPermission("bus:alarm:cause")
     public R<Boolean> cause(@PathVariable("id") String id, @RequestBody@Validated CauseVo cause) {
         deviceAlarmService.addCause(id,cause.getCause());
         return R.success(true);