diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java index 3fb6262..64b134d 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateLineVo.java @@ -4,28 +4,25 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import java.util.List; +import javax.validation.constraints.NotNull; @Data @ApiModel(value = "修改线路对象", description = "修改线路对象描述") public class UpdateLineVo { @ApiModelProperty(value = "线路编号", example = "123456") - @NotBlank(message = "线路编号不能缺少") + @NotNull(message = "线路编号不能缺少") private Integer id; @ApiModelProperty(value = "线路名称", example = "名称名称") - @NotBlank(message = "线路名称不能缺少") + @NotNull(message = "线路名称不能缺少") private String name; @ApiModelProperty(value = "单位", example = "单位") - @NotBlank(message = "单位不能缺少") private String bsManufacturer; @ApiModelProperty(value = "电压等级编号", example = "型号型号") - @NotBlank(message = "电压编号不能缺少") + @NotNull(message = "电压编号不能缺少") private Integer dyLevelid; } diff --git a/xymanager_dao/src/main/resources/mappers/LinesDao.xml b/xymanager_dao/src/main/resources/mappers/LinesDao.xml index 924380d..28fc9a9 100644 --- a/xymanager_dao/src/main/resources/mappers/LinesDao.xml +++ b/xymanager_dao/src/main/resources/mappers/LinesDao.xml @@ -33,7 +33,7 @@ y.name as dy_level_name from `lines` x, dy_level y - where x.dy_level_id = y.id and x.status = #{status} + where x.dy_level_id = y.id and x.status = #{status} order by x.create_time desc