Merge remote-tracking branch 'origin/master'

2024-10-31 17:49:27 +08:00 · 2024-10-31 17:49:27 +08:00 · ad954969d3
parent 4ac43bd04c 036dc39deb
commit ad954969d3
1 changed files with 1 additions and 0 deletions
--- 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
@ -149,6 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            mtk.user_id as keeperId,
            mtr.user_id as repairId,
            baa.asset_name as assetName,
+            ma.assets_id as assetsId,
            ma.remark as remark
        FROM
            ma_machine ma