Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-06-26 c46cb6a71c35f38c7f23a2d01ad686f46a3d0e0b

 north-glass-erp/src/main/resources/mapper/pp/Report.xml

@@ -614,7 +614,7 @@
    <select id="productionScheduleMp">
        select
            a.order_number,
            if(od.shape=1,'普形',if(od.shape=2,'异形','')) as shape,
            if(a.shape=1,'普形',if(a.shape=2,'异形','')) as shape,
            a.product_name,
            b.child_width,
            b.child_height,