Merge remote-tracking branch 'origin/main'

2026-08-12 21:02:08 +08:00 · 2024-09-06 14:32:06 +08:00
parent 24e3ddfe09 70b02df792
commit c9e78f74ae
16 changed files with 239 additions and 203 deletions
@@ -161,9 +161,8 @@
            ,CONCAT(YEAR(p.create_time), '-', MONTH(p.create_time), '-', DAY(p.create_time)) as date
        </if>
        from order_plan p
-        join order_plan_item opi on p.id = opi.plan_id
-        join order_item oi on oi.id = opi.item_id
-        join order_plate op on oi.plate_id = op.id
+        join order_goods g on g.plan_id = p.id
+        join order_plate op on op.goods_id = g.id
        where p.create_time between #{req.createTime[0]} and #{req.createTime[1]}
        and p.deleted = 0
        group by date;