diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java index 60bf9df..cde8acc 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java @@ -68,6 +68,9 @@ public class DevInfo extends BaseEntity { @ApiModelProperty(value = "整机装备重量") private String deviceWeight; + @ApiModelProperty(value = "设备管理方式: 0编码 1数量") + private Byte deviceType; + @Excel(name = "设备数量") @ApiModelProperty(value = "设备数量") private Integer deviceCount; diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 93dff3a..200ada2 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -227,6 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.ma_id as maId, d.code as code, d.buy_price as buyPrice, + d.device_type as deviceType, d.item_type_model as itemTypeModel, identify_code as identifyCode, d.device_name as deviceName, @@ -288,6 +289,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" device_name, device_weight, + device_type, device_count, code, identify_code, @@ -331,6 +333,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deviceName}, #{deviceWeight}, + #{deviceType}, #{deviceCount}, #{code}, #{identifyCode},