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

liyong

9 天以前 7e2abbf8f235d20e6c45aa6ce9dceb9eb93fd1c2

 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