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

zss

22 小时以前 e595c86c223563a178b9bb0d0dcb8b0c3c3771c0

 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