Merge remote-tracking branch 'origin/master' into test

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

@@ -24,6 +24,9 @@ public enum DeviceErrorRecordTypesEnum {
     CAMERA("D015", "摄像头故障"),
 
     COMPRESSOR("D016", "压缩机故障"),
+
+    ACTIVITY("D017", "活动故障"),
+
     ;
     private String code;
     private String msg;