#MOD 商户设备授权

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -396,7 +397,7 @@ public class DeviceInfoDto {
 
         @ApiModelProperty("温度值")
         private Integer tempValue;
- 
+
 
     }
 
@@ -485,8 +486,7 @@ public class DeviceInfoDto {
         @ApiModelProperty(value = "对应商户的全量设备ID(传空则取消商户所有机器)", required = false)
         private List<Long> deviceIds;
 
-        @NotNull(message = "商户ID不可为空")
-        @ApiModelProperty(value = "商户ID", required = true)
+        @ApiModelProperty(value = "商户ID", required = false)
         private Long mercId;
 
         @ApiModelProperty(value = "父商户ID")
@@ -495,7 +495,9 @@ public class DeviceInfoDto {
         @ApiModelProperty(value = "商户名称", required = false)
         private String mercName;
 
-        @ApiModelProperty(value = "商户编码", required = false)
+
+        @NotBlank(message = "商户编码不可为空")
+        @ApiModelProperty(value = "商户编码", required = true)
         private String mercCode;
 
         @ApiModelProperty(value = "算法ID", required = false)