north-glass-erp/target/classes/mapper/pp/Report.xml
@@ -63,7 +63,11 @@ e.reportWorkQuantityCount, e.broken_num, round(ifnull(f.inventory,0)*a.area,2) as inventoryArea <<<<<<< HEAD ======= >>>>>>> b27e80bcfaacc225fcf8d2f1617b98bdedb7edf7 from flow_card as c left join @@ -96,8 +100,14 @@ ) as e on e.process_id = c.process_id and e.technology_number = c.technology_number <<<<<<< HEAD where a.order_id = #{orderId} ======= where a.order_id = #{orderId} >>>>>>> b27e80bcfaacc225fcf8d2f1617b98bdedb7edf7 </select> </mapper>
