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

zss

昨天 2be29256f04c9822dc793c75dfae16c3262d2faf

 src/main/resources/mapper/production/ProductionProductMainMapper.xml

@@ -21,7 +21,7 @@
               pm.model as productModelName,
               ppo.quantity,
               pm.unit,
               sl.customer_contract_no salesContractNo
               sl.sales_contract_no salesContractNo
        from
            production_product_main ppm
                left join product_work_order pwo on pwo.id = ppm.work_order_id