Merge branch 'master' of http://192.168.0.56:3000/bonus/Bonus-Cloud-Material
This commit is contained in:
commit
a6d4772a24
|
|
@ -246,7 +246,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
mm.qr_code as qrCode,
|
||||
case when mm.ma_status = '1' then '在库'
|
||||
else ''
|
||||
end as statusName
|
||||
end as statusName,
|
||||
mt.manage_type as manageType
|
||||
FROM ma_machine mm
|
||||
LEFT JOIN ma_type mt ON mm.type_id = mt.type_id AND mt.del_flag = '0'
|
||||
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id AND mt1.del_flag = '0'
|
||||
|
|
|
|||
Loading…
Reference in New Issue