Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-08-06 d20289401001352bb20ca0bd614f4ef3e2c749d0

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

@@ -32,6 +32,14 @@
            date(a.create_time)  BETWEEN DATE_FORMAT(DATE(NOW()), '%Y-%m-01') AND DATE(NOW())
    </select>
    
    <select id="selectMaxOrderIdByYear">
        select
            ifnull(SUBSTR(max(order_id) from 5),0)
        from
            `order` as a
        where
            year(a.create_time)  = year(NOW())
    </select>

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