Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhn
2022-02-14 18:13:39 +08:00
@@ -78,8 +78,6 @@ public class OnlCgformArea implements Serializable {
/**排序号*/
@Excel(name = "排序号", width = 15)
@javax.validation.constraints.Pattern(regexp = "^-?[1-9]\\d+$",message = "请输入正确的整数")
@javax.validation.constraints.NotNull(message = "不能为空")
@ApiModelProperty(value = "排序号")
private java.lang.Integer sort;