diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java index 78cfd22b..8913cda0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java @@ -163,4 +163,7 @@ public class Machine extends BaseEntity @ApiModelProperty("规格型号-四级") private String materialModel; + @ApiModelProperty("资产属性ID") + private String assetsId; + } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml index 1f0037cb..2ac8a133 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml @@ -270,6 +270,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" inspect_man = #{inspectMan}, inspect_status = #{inspectStatus}, phone = #{phone}, + assets_id = #{assetsId}, + remark = #{remark}, where ma_id = #{maId}