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

guoyuji

2024-07-12 f4e8f069d050293232cfe68ebd38b2b05c4ad4b4

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java

@@ -40,5 +40,7 @@

    List<OrderDetail> getOrderProductByProductId(Object productId, String orderId);

    List<Map<String,Object>> getOrderProductByProductIds(Object productId, String orderId);


}