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

buhuazhen

8 天以前 3138e373e0c9c7eb5e0b0847ef16a7753c4fc170

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

@@ -49,7 +49,7 @@
    <select id="selectDailyOutputStats" resultType="java.util.Map">
        SELECT
            DATE_FORMAT(create_time, '%Y-%m-%d') as date,
            SUM(quantity) as quantity
            SUM(quantity-scrap_qty) as quantity
        FROM
            production_product_output
        WHERE