#MOD

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

@@ -393,8 +393,7 @@ public class DeviceInfoDto {
         @ApiModelProperty(value = "对应商户的全量设备ID(传空则取消商户所有机器)", required = false)
         private List<Long> deviceIds;
 
-        @NotNull(message = "商户ID不可为空")
-        @ApiModelProperty(value = "商户ID", required = true)
+        @ApiModelProperty(value = "商户ID")
         private Long mercId;
 
         @ApiModelProperty(value = "商户编码", required = true)