Merge branch 'master' into test

device-api/src/main/java/com/xy/utils/enums/DeviceErrorRecordTypesEnum.java

@@ -25,8 +25,6 @@ public enum DeviceErrorRecordTypesEnum {
 
     COMPRESSOR("D016", "压缩机故障"),
 
-    ACTIVITY("D017", "活动故障"),
-
     ;
     private String code;
     private String msg;