Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-09-03 76bf2824bf55e8f4c3ccbc14b3b2719bf8fb219f

 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml

@@ -31,7 +31,16 @@
        where
            date(a.create_time)  BETWEEN DATE_FORMAT(DATE(NOW()), '%Y-%m-01') AND DATE(NOW())
    </select>
    

    <select id="selectMaxOrderIdByYear">
       select ifnull((select
            SUBSTR(order_id from 5)
        from
            `order` as a
        where
            year(a.create_time)  = year(now())
        order by  id desc limit 1),0) temp
    </select>

    <update id="updateOrderParameter">
        update `order` o