diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherPageReqVO.java index 73e49a5..a2c4584 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherPageReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherPageReqVO.java @@ -45,7 +45,7 @@ public class MaterialOtherPageReqVO extends PageParam { private LocalDateTime[] createTime; @Schema(description = "小数位数") - private Long decimal; + private Long decimalValue; @Schema(description = "是否启用") private String isEnable; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherRespVO.java index ec43586..1903f28 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherRespVO.java @@ -58,7 +58,7 @@ public class MaterialOtherRespVO { @Schema(description = "小数位数") @ExcelProperty("小数位数") - private Long decimal; + private Long decimalValue; @Schema(description = "是否启用") @ExcelProperty("是否启用") diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherSaveReqVO.java index 3c86e30..938f5ea 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherSaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherSaveReqVO.java @@ -38,7 +38,7 @@ public class MaterialOtherSaveReqVO { private String gradeUnit; @Schema(description = "小数位数") - private Long decimal; + private Long decimalValue; @Schema(description = "是否启用") private String isEnable; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialOtherDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialOtherDO.java index 983b276..de1c34c 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialOtherDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialOtherDO.java @@ -102,7 +102,7 @@ public class MaterialOtherDO extends BusinessBaseDO { * 小数位数 */ @TableField("DEC") - private Long decimal; + private Long decimalValue; /** * 创建人名称 */ diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java index ced6a90..3064d3e 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java @@ -27,7 +27,7 @@ public interface MaterialOtherMapper extends BaseMapperX { .eqIfPresent(MaterialOtherDO::getCoding, reqVO.getCoding()) .eqIfPresent(MaterialOtherDO::getGradeUnit, reqVO.getGradeUnit()) .betweenIfPresent(MaterialOtherDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(MaterialOtherDO::getDecimal, reqVO.getDecimal()) + .eqIfPresent(MaterialOtherDO::getDecimalValue, reqVO.getDecimalValue()) .eqIfPresent(MaterialOtherDO::getIsEnable, reqVO.getIsEnable()) .orderByDesc(MaterialOtherDO::getId)); }