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

chenlu

2025-08-11 8bcd0cc77b0c7aa2c00ffd926ee87f1f09a3a3b5

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

@@ -110,7 +110,7 @@
            sd.`order` as o
        left join mm.finished_goods_inventory as  fgi
        on o.order_id = fgi.order_id
        where  date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
        where  date(o.create_time) between #{startDate} and  #{endDate}

          <if test="orderType!= null and orderType != ''">
               and o.create_order = #{orderType}