diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java index cdca194aa..bac0f3502 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java @@ -111,7 +111,7 @@ public class ParamsInfoEO implements Serializable { private String controlType; /**控件校验*/ - @Excel(name = "控件校验", width = 15, replace = {"无_1","中文_2","正整数_3","正浮点数_4","整数或小数_5","一位小数_6","两位小数_7","三位小数_8","四位小数_9"}) + @Excel(name = "控件校验", width = 15, replace = {"无_1","中文_2","整数_3","正浮点数_4","整数或小数_5","一位小数_6","两位小数_7","三位小数_8","四位小数_9"}) @ApiModelProperty(value = "控件校验") private String controlVerify; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java index b8b399e51..8bb6ccc20 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/enums/ControlVerifyEnum.java @@ -13,7 +13,7 @@ import java.util.Map; public enum ControlVerifyEnum { NULL("无","Null","1"), CHINESE("中文","Chinese","2"), - POSITIVE_INTEGER("正整数","Positive integer","3"), + POSITIVE_INTEGER("整数","Integer","3"), POSITIVE_FLOAT("正浮点数","Positive float","4"), INTEGER_DECIMAL("整数或小数","Integer decimal","5"), DECIMAL_ONE("一位小数","Decimal one","6"), diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java index e4e9b0339..6a9163656 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java @@ -94,7 +94,7 @@ public class ParamsInfoEnExport { private String controlType; /**控件校验*/ - @Excel(name = "Control Verify", width = 15, replace = {"Null_1","Chinese_2","Positive integer_3","Positive float_4","Integer decimal_5","Decimal one_6","Decimal two_7","Decimal three_8","Decimal four_9"}) + @Excel(name = "Control Verify", width = 15, replace = {"Null_1","Chinese_2","Integer_3","Positive float_4","Integer decimal_5","Decimal one_6","Decimal two_7","Decimal three_8","Decimal four_9"}) @ApiModelProperty(value = "控件校验") private String controlVerify;