bug

sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml

@@ -362,6 +362,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE a.parentId is not null
     </select>
     <select id="getMaMachineByMaTypeAndMaCode" resultType="com.bonus.sgzb.base.api.domain.MaMachine">
-        select * from ma_machine where ma_code = #{maCode}
+        select * from ma_machine where qr_code = #{qrCode} or ma_code = #{maCode}
     </select>
 </mapper>