Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml

@@ -168,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 left join ma_type mt ON mdi.type_id = mt.type_id
                 AND bfi.file_type = 0
         WHERE
-            hh.id = #{id} and bfi.task_type = 17 limit 1
+            hh.id = #{id} limit 1
     </select>
     <select id="getOrderDetailsById" resultType="com.bonus.material.order.domain.OrderInfoDto">
         SELECT