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

廖井涛

2024-08-04 1ae5f2198b70aba54c49f1752e02dfe7b9d5a2e9

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

@@ -826,8 +826,8 @@
                           on d.type_id = c.type_id
                 left join sd.basic_glass_type as e
                           on e.type_id = d.belong
        where date(a.create_time) >= #{dates[0]}
          and date(a.create_time) <= #{dates[1]}
        where date(b.create_time) >= #{dates[0]}
          and date(b.create_time) <= #{dates[1]}
        group by b.order_id, a.product_id
        order by b.order_id desc
    </select>