diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java index 519cbe35..688dd4e1 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java @@ -3,17 +3,18 @@ package com.ruoyi.ss.device.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonView; import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.constants.DictTypeConstants; import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.JsonViewProfile; import com.ruoyi.common.core.domain.ValidGroup; -import com.ruoyi.system.valid.DictValid; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.validator.constraints.Range; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.*; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Past; +import javax.validation.constraints.Size; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.Date; @@ -151,8 +152,8 @@ public class Device extends BaseEntity private BigDecimal serviceRate; @ApiModelProperty("服务费类型") - @NotBlank(message = "服务费类型不允许为空", groups = {ValidGroup.Create.class}) - @DictValid(type = DictTypeConstants.SERVICE_TYPE, message = "非法的服务费类型") +// @NotBlank(message = "服务费类型不允许为空", groups = {ValidGroup.Create.class}) +// @DictValid(type = DictTypeConstants.SERVICE_TYPE, message = "非法的服务费类型") private String serviceType; @ApiModelProperty("剩余时长(秒)")