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

maven

5 天以前 bee04140fad1310e3d2e66ccbeb6f8b649bff6e8

 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