From 850caa7547d8db5987dbd9e714beff319a3c8229 Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Wed, 19 Jun 2024 16:21:13 +0800 Subject: [PATCH] updates --- .../modules/yx/entity/YxSchoolMajor.java | 55 ++++++++++--------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java index 3de31f4..e30869f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java @@ -133,33 +133,6 @@ public class YxSchoolMajor implements Serializable { @ApiModelProperty(value = "院校限制") private String limitation; - /** - * 文化分限制 - */ - @ApiModelProperty(value = "文化成绩限制") - @Excel(name = "文化成绩限制", width = 15) - private BigDecimal culturalScoreLimitation; - - /** - * 专业分限制 - */ - @ApiModelProperty(value = "专业成绩限制") - @Excel(name = "专业成绩限制", width = 15) - private BigDecimal professionalScoreLimitation; - - /** - * 语文分限制 - */ - @ApiModelProperty(value = "语文成绩限制") - @Excel(name = "语文成绩限制", width = 15) - private BigDecimal chineseScoreLimitation; - - /** - * 外语成绩限制 - */ - @ApiModelProperty(value = "外语成绩限制") - @Excel(name = "外语成绩限制", width = 15) - private BigDecimal englishScoreLimitation; /** * 考试类型(统考/校考) @@ -188,4 +161,32 @@ public class YxSchoolMajor implements Serializable { @Excel(name = "内部录取方式运算符", width = 15) @ApiModelProperty(value = "内部录取方式运算符") private String privateProbabilityOperator; + + /** + * 文化分限制 + */ + @ApiModelProperty(value = "文化成绩限制") + @Excel(name = "文化成绩限制", width = 15) + private BigDecimal culturalScoreLimitation; + + /** + * 专业分限制 + */ + @ApiModelProperty(value = "专业成绩限制") + @Excel(name = "专业成绩限制", width = 15) + private BigDecimal professionalScoreLimitation; + + /** + * 语文分限制 + */ + @ApiModelProperty(value = "语文成绩限制") + @Excel(name = "语文成绩限制", width = 15) + private BigDecimal chineseScoreLimitation; + + /** + * 外语成绩限制 + */ + @ApiModelProperty(value = "外语成绩限制") + @Excel(name = "外语成绩限制", width = 15) + private BigDecimal englishScoreLimitation; }