Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

server-module/src/main/java/com/makeit/module/controller/space/PlatSpaceController.java

@@ -80,7 +80,7 @@ public class PlatSpaceController {
         return ApiResponseUtils.success(data);
         return ApiResponseUtils.success(data);
     }
     }
 
 
-    @ApiOperation("树-到床位（已住人床位）")
+    @ApiOperation("树-到床位（未住人床位）")
     @PostMapping("listTreeAuthIgnoreByBed")
     @PostMapping("listTreeAuthIgnoreByBed")
     public ApiResponseEntity<List<PlatSpaceVO>> listTreeAuthIgnoreByBed(@RequestBody PlatSpaceQueryDTO dto) {
     public ApiResponseEntity<List<PlatSpaceVO>> listTreeAuthIgnoreByBed(@RequestBody PlatSpaceQueryDTO dto) {
         List<PlatSpaceVO> data = spaceService.listBedTree(dto,true);
         List<PlatSpaceVO> data = spaceService.listBedTree(dto,true);

server-service/src/main/java/com/makeit/enums/report/HeartRateTypeEnum.java

@@ -9,7 +9,7 @@ public enum HeartRateTypeEnum {
 
 
 
 
     BRADYCARDIA("bradycardia","心率过缓"),
     BRADYCARDIA("bradycardia","心率过缓"),
-    TACHYCARDIA("tachycardia","呼吸过速");
+    TACHYCARDIA("tachycardia","心率过速");
 
 
     private String code;
     private String code;
     private String value;
     private String value;