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

zss

6 天以前 1c215236bcaafd414a1f47e71338fe9c1bbcfb3a

 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