diff --git a/bonus-common-biz/lib/sms-util-1.0.jar b/bonus-common-biz/lib/sms-util-1.0.jar new file mode 100644 index 0000000..7b09355 Binary files /dev/null and b/bonus-common-biz/lib/sms-util-1.0.jar differ 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 f0dd929..60bf9df 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 @@ -82,6 +82,18 @@ public class DevInfo extends BaseEntity { @NotBlank(message = "单位不能为空") private String unitName; + /** + * 装备原值-- 250913应对地市公司录入临时采用此字段(田聪聪要求) + */ + @ApiModelProperty(value = "装备原值") + private BigDecimal buyPrice; + + /** + * 规格名称-- 250913应对地市公司录入临时采用此字段(田聪聪要求) + */ + @ApiModelProperty(value = "规格名称") + private String itemTypeModel; + /** * 类型id */ 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 31c4b2f..93dff3a 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 @@ -226,6 +226,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT d.ma_id as maId, d.code as code, + d.buy_price as buyPrice, + d.item_type_model as itemTypeModel, identify_code as identifyCode, d.device_name as deviceName, d.device_weight as deviceWeight, @@ -323,6 +325,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" check_cycle, is_zone, zone_id, + buy_price, + item_type_model, #{deviceName}, @@ -364,6 +368,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{checkCycle}, #{isZone}, #{zoneId}, + #{buyPrice}, + #{itemTypeModel}, @@ -416,6 +422,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" check_cycle = #{checkCycle}, is_zone = #{isZone}, zone_id = #{zoneId}, + buy_price = #{buyPrice}, + item_type_model = #{itemTypeModel}, update_time = now() where ma_id = #{maId}