diff --git a/detection/src/main/java/com/njcn/gather/device/pojo/vo/ProvinceDevExcel.java b/detection/src/main/java/com/njcn/gather/device/pojo/vo/ProvinceDevExcel.java index 2d0062fc..7e0032cb 100644 --- a/detection/src/main/java/com/njcn/gather/device/pojo/vo/ProvinceDevExcel.java +++ b/detection/src/main/java/com/njcn/gather/device/pojo/vo/ProvinceDevExcel.java @@ -63,15 +63,15 @@ public class ProvinceDevExcel implements Serializable { @Excel(name = "秘钥(当加密时必填)", width = 30, orderNum = "14") private String devKey; - @Excel(name = "是否支持系数校准*", width = 25, replace = {"否_0", "是_1"}, orderNum = "15") - private Integer factorFlag; +// @Excel(name = "是否支持系数校准*", width = 25, replace = {"否_0", "是_1"}, orderNum = "15") +// private Integer factorFlag; - @Excel(name = "IP地址*", width = 20, orderNum = "16") + @Excel(name = "IP地址*", width = 20, orderNum = "15") @NotBlank(message = DetectionValidMessage.IP_NOT_BLANK) @Pattern(regexp = PatternRegex.IP_REGEX, message = DetectionValidMessage.IP_FORMAT_ERROR) private String ip; - @Excel(name = "端口号*", width = 15, orderNum = "17") + @Excel(name = "端口号*", width = 15, orderNum = "16") @NotNull(message = DetectionValidMessage.PORT_NOT_NULL) @Range(min = 1, max = 65535, message = DetectionValidMessage.PORT_RANGE_ERROR) private Integer port;