zgty/zt-base
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

物料管理decimal字段关键字冲突，改为decimalValue

Browse Source
This commit is contained in:
liss
2025-09-28 17:05:30 +08:00
parent 1fb32bc43f
commit 04949bb027
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherPageReqVO.java
View File

@@ -45,7 +45,7 @@ public class MaterialOtherPageReqVO extends PageParam {
private LocalDateTime[] createTime; private LocalDateTime[] createTime;
@Schema(description = "小数位数") @Schema(description = "小数位数")
private Long decimal; private Long decimalValue;
@Schema(description = "是否启用") @Schema(description = "是否启用")
private String isEnable; private String isEnable;

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherRespVO.java
View File

@@ -58,7 +58,7 @@ public class MaterialOtherRespVO {
@Schema(description = "小数位数") @Schema(description = "小数位数")
@ExcelProperty("小数位数") @ExcelProperty("小数位数")
private Long decimal; private Long decimalValue;
@Schema(description = "是否启用") @Schema(description = "是否启用")
@ExcelProperty("是否启用") @ExcelProperty("是否启用")

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherSaveReqVO.java
View File

@@ -38,7 +38,7 @@ public class MaterialOtherSaveReqVO {
private String gradeUnit; private String gradeUnit;
@Schema(description = "小数位数") @Schema(description = "小数位数")
private Long decimal; private Long decimalValue;
@Schema(description = "是否启用") @Schema(description = "是否启用")
private String isEnable; private String isEnable;

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialOtherDO.java
View File

@@ -102,7 +102,7 @@ public class MaterialOtherDO extends BusinessBaseDO {
* 小数位数 * 小数位数
*/ */
@TableField("DEC") @TableField("DEC")
private Long decimal; private Long decimalValue;
/** /**
* 创建人名称 * 创建人名称
*/ */

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java
View File

@@ -27,7 +27,7 @@ public interface MaterialOtherMapper extends BaseMapperX<MaterialOtherDO> {
.eqIfPresent(MaterialOtherDO::getCoding, reqVO.getCoding()) .eqIfPresent(MaterialOtherDO::getCoding, reqVO.getCoding())
.eqIfPresent(MaterialOtherDO::getGradeUnit, reqVO.getGradeUnit()) .eqIfPresent(MaterialOtherDO::getGradeUnit, reqVO.getGradeUnit())
.betweenIfPresent(MaterialOtherDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(MaterialOtherDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(MaterialOtherDO::getDecimal, reqVO.getDecimal()) .eqIfPresent(MaterialOtherDO::getDecimalValue, reqVO.getDecimalValue())
.eqIfPresent(MaterialOtherDO::getIsEnable, reqVO.getIsEnable()) .eqIfPresent(MaterialOtherDO::getIsEnable, reqVO.getIsEnable())
.orderByDesc(MaterialOtherDO::getId)); .orderByDesc(MaterialOtherDO::getId));
} }