From 25210e04b61deb04aee76b55f2dec55c13f5e0d4 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Thu, 13 Jun 2024 17:56:24 +0800
Subject: [PATCH] bug

---
 .../src/main/resources/mapper/base/MaMachineMapper.xml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
index 4c92454d..528d3b75 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
+++ b/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>
\ No newline at end of file