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

chenlu

2024-05-22 b4d9093f066e750c3f623d5eb2e130532bb2fba6

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

@@ -392,12 +392,12 @@
        </if>
    </select>

    <select id="exportOrderReport">
    <select id="exportOrderReport"  >
        SELECT
            *,
            a.create_time as createTime,
            d.type_name as levelOne,
            e.type_name as levelTwo
            d.type_name as level_one,
            e.type_name as level_two
        from order_detail as a
         left join sd.`order` as b
                   on b.order_id = a.order_id
@@ -408,7 +408,6 @@
         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) &lt;= #{dates[1]}

    </select>