Merge remote-tracking branch 'origin/master'

This commit is contained in:
mashuai 2024-12-03 19:28:00 +08:00
commit c94a0aba93
1 changed files with 2 additions and 2 deletions

View File

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