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

guoyuji

2024-07-05 cac51e7aacded53a855a65d02ea6c57305ea15fe

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

@@ -33,7 +33,7 @@

    List<Map<String,Object>> getOrderProductDistinctById(String orderId);

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

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