Merge branch 'master-fix' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderItem/OrderItemMapper.java

@@ -232,7 +232,7 @@ public interface OrderItemMapper extends AbstractMapper<OrderItemDO> {
             "oi.*, ",
             "IF(#{lang} = 0, pd.title_zh, pd.title_en) as brand_name, ",
             "(select count(0) from ecw_order_guanlian t LEFT JOIN ecw_order t1 on t.order_id=t1.order_id LEFT JOIN ecw_order t2 on t.relate_order_id=t2.order_id  where (t.order_id = oi.order_id or t.relate_order_id = oi.order_id) and t1.deleted=0 and t2.deleted=0 and t.deleted=0 ) as guanLianOrderCount, ",
-            "(select count(0) from ecw_order_warehouse_in owi where owi.order_item_id = eoi.order_item_id and owi.deleted = 0 and JSON_LENGTH(owi.order_warehouse_in_details) > 0) as mixCount",
+            "(select count(0) from ecw_order_warehouse_in owi where owi.order_item_id = oi.order_item_id and owi.deleted = 0 and JSON_LENGTH(owi.order_warehouse_in_details) > 0) as mixCount",
             "from ecw_order_item oi",
             "left join ecw_product_brank pd",
             "on pd.id = oi.brand",