Merge branch 'master' into test

device-api/src/main/java/com/xy/dto/DeviceChargingConfigDto.java

@@ -27,6 +27,10 @@ public class DeviceChargingConfigDto {
         @NotNull(message = "mercId不能为空")
         @ApiModelProperty(value = "商户id", required = true)
         private Long mercId;
+
+        @NotNull(message = "deviceType不能为空")
+        @ApiModelProperty(value = "设备类型", required = true)
+        private Integer deviceType;
     }
 
     @Data