Merge remote-tracking branch 'origin/master'

日更新
2025-07-30 18:28:08 +08:00 · 2025-07-30 18:28:01 +08:00
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
@ -693,6 +693,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        ma.qr_code as qrCode,
        ma.buy_price as buyPrice,
        msi.supplier as maVender,
+        msi.supplier_id AS supplierId,
        ma.out_fac_time as outFacTime,
        ma.out_fac_code as outFacCode,
        ma.assets_code as assetsCode,
Author	SHA1	Message	Date
jiang	0f29e252bc	Merge remote-tracking branch 'origin/master'	2025-07-30 18:28:08 +08:00
jiang	962853c093	日更新	2025-07-30 18:28:01 +08:00