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

maven

3 天以前 61b1802b1b26fc35c07fd09edc4ff2ff8ade6688

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

@@ -20,6 +20,7 @@
               p.product_name as productName,
               pm.model as productModelName,
               ppo.quantity,
               ppo.scrap_qty,
               pm.unit,
               sl.sales_contract_no salesContractNo
        from