Merge remote-tracking branch 'origin/dev' into dev

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

@@ -68,7 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND mps.prop_id = #{propId}
             </if>
             <if test="keyWord != null and keyWord != ''">
-                AND (m.ma_code like concat('%',#{keyWord},'%') or m.buy_task like concat('%',#{keyWord},'%'))
+                AND (m.ma_code like concat('%',#{keyWord},'%') or m.buy_task like concat('%',#{keyWord},'%')
+                or mt.type_name like concat('%',#{keyWord},'%') or mt1.type_name like concat('%',#{keyWord})
+                or mt2.type_name like concat('%',#{keyWord}))
             </if>
             <if test="beginTime != null and endTime != null and beginTime != '' and endTime != null">
                 AND m.create_time between #{beginTime} and #{endTime}