From 6c9a727fe8a0444f029d94f02ebc5ac6c66787c9 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Tue, 29 Oct 2024 16:42:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/bonus/material/ma/domain/Machine.java    | 3 +++
 .../src/main/resources/mapper/material/ma/MachineMapper.xml    | 2 ++
 2 files changed, 5 insertions(+)

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"
             <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>