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

gongchunyi

4 天以前 2d1e904f3049218474318cb1e2fe5c3a3869cfb0

 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