diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/StandardConfigDetailsVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/StandardConfigDetailsVo.java index 12f9f25b..1a1d9335 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/StandardConfigDetailsVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/StandardConfigDetailsVo.java @@ -110,4 +110,7 @@ public class StandardConfigDetailsVo { @ApiModelProperty(value = "层级") private String level; + @ApiModelProperty(value = "是否整数") + private Integer unitValue; + } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/StandardConfigManageMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/StandardConfigManageMapper.xml index a2f0e92f..bf4cad66 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/StandardConfigManageMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/StandardConfigManageMapper.xml @@ -134,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.typeName, a.typeModelName, a.unit, + a.unitValue, bscd.num, bscd.remark FROM @@ -147,7 +148,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt3.type_name AS materialType, mt2.type_name AS typeName, mt.type_name AS typeModelName, - mt.unit_name AS unit + mt.unit_name AS unit, + mt.unit_value AS unitValue FROM ma_type mt LEFT JOIN