From e37ff62fd3dc13328b03bc30cbc4909fdea90aad Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Mon, 18 Aug 2025 11:24:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/material/ma/MachineMapper.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 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
index 80794510..20ac6078 100644
--- 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
@@ -496,7 +496,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mi.check_man as checkMan,
             mi.phone,
             mi.result,null AS reportCode,null AS reportUrl,
-            mi.type
+            mi.type,
+            '1' as devType
         FROM
             ws_ma_info mi
         WHERE mi.ma_code LIKE CONCAT('%',#{maCode},'%') and mi.is_active = 1 and DATEDIFF(mi.next_check_time,NOW()) > 0
@@ -512,7 +513,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ifnull(mm.inspect_man,"高民")   as checkMan,
             "0551-63703966" as phone,
             "合格" as result,mm.ex_code AS reportCode,mm.ex_url AS reportUrl,
-            is_jj as type
+            is_jj as type,
+            '2' as devType
         FROM ma_machine mm
                  LEFT JOIN ma_type mt on mm.type_id = mt.type_id
                  LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id