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 2cee947..31fbc28 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 @@ -47,6 +47,11 @@ public class DevInfo extends BaseEntity { @ApiModelProperty(value = "设备编码") private String code; + /** 设备唯一标识符,用户输入,比如车架号 */ + @Excel(name = "设备唯一标识符") + @ApiModelProperty(value = "设备唯一标识符") + private String identifyCode; + @ApiModelProperty(value = "装备名称") @NotBlank private String deviceName; 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 945eff8..95582e3 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 @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -43,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select ma_id, device_name, device_weight, device_count, code, type_id, ma_status, lease_scope, location, province_id, city_id, area_id, brand, model_name, production_date, working_hours, serial_number, + select ma_id, device_name, device_weight, device_count, code, identify_code, type_id, ma_status, lease_scope, location, province_id, city_id, area_id, brand, model_name, production_date, working_hours, serial_number, pic_url, js_month_price, js_day_price, description, gps_code, own_co, create_time, creator, update_time, person, person_phone, update_by, specification, deposit, is_operator, is_active, update_time, update_by from ma_dev_info @@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT d.ma_id as maId, d.code as code, + d.identify_code as identifyCode, d.device_name as deviceName, d.device_weight as deviceWeight, d.device_count as deviceCount, @@ -170,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT d.ma_id as maId, d.code as code, + d.identify_code as identifyCode, d.device_name as deviceName, d.device_count as deviceCount, d.device_weight as deviceWeight, @@ -215,6 +218,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT d.ma_id as maId, d.code as code, + identify_code as identifyCode, d.device_name as deviceName, d.device_weight as deviceWeight, d.device_count as deviceCount, @@ -273,6 +277,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" device_weight, device_count, code, + identify_code, type_id, ma_status, lease_scope, @@ -600,6 +605,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" device_weight, device_count, code, + identify_code, type_id, ma_status, lease_scope,