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 4589f86..c933295 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 @@ -72,6 +72,9 @@ public class DevInfo extends BaseEntity { @ApiModelProperty(value = "设备数量") private Integer deviceCount; + @ApiModelProperty(value = "设备单位,例如(台)") + private String deviceUnitType; + @ApiModelProperty(value = "比率的范围,比如: x%-y%") private String ratioRange; 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 f8a7330..7a327ed 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 @@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.device_name as deviceName, d.device_weight as deviceWeight, d.device_count as deviceCount, + d.device_unit_type as deviceUnitType, d.type_id as typeId, mt4.type_name as typeName, mt4.unit_name as unitName, @@ -235,6 +236,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.device_name as deviceName, d.device_weight as deviceWeight, d.device_count as deviceCount, + d.device_unit_type as deviceUnitType, d.type_id as typeId, d.check_date as checkDate, d.check_cycle as checkCycle, @@ -304,6 +306,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" device_name, device_weight, device_count, + device_unit_type, code, identify_code, type_id, @@ -326,18 +329,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" own_co, person, person_phone, - level_type + level_type, assetValue, purchaseSource, create_time, creator, update_time, - update_by, + updateBy, specification, deposit, is_operator, is_active, - update_by, own_id, check_date, check_cycle, @@ -352,6 +354,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deviceName}, #{deviceWeight}, #{deviceCount}, + #{deviceUnitType}, #{code}, #{identifyCode}, #{typeId}, @@ -370,22 +373,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{jsMonthPrice}, #{jsDayPrice}, #{description}, - #{gpsCode}, + #{gpsCode}, #{companyId}, #{person}, #{personPhone}, - #{levelType} + #{levelType}, #{assetValue}, #{purchaseSource}, now(), #{creator}, now(), - #{update_by}, + #{updateBy}, #{specification}, #{deposit}, #{isOperator}, #{isActive}, - #{updateBy}, #{ownId}, #{checkDate}, #{checkCycle},