Merge remote-tracking branch 'origin/master'

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;
+
 }

bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml

@@ -270,6 +270,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inspectMan != null">inspect_man = #{inspectMan},</if>
             <if test="inspectStatus != null">inspect_status = #{inspectStatus},</if>
             <if test="phone != null">phone = #{phone},</if>
+            <if test="assetsId != null">assets_id = #{assetsId},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where ma_id = #{maId}
     </update>