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

guoyuji

2024-07-04 cf5330c151429e517eba72ec9fe0289b6ee98a72

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -457,9 +457,9 @@
        return returns;
    }

    public Object printOrderProductDetails(String orderId,String productId) {
    public Object printOrderProductDetails(String orderId,List<String> productId) {
        List<Map<String,Object>> orderProductDistinct;
        if (productId!=""){
        if (productId.size()>0){
             orderProductDistinct = orderDetailMapper.getOrderProductDistinctByIds(orderId,productId);
        }else{
             orderProductDistinct = orderDetailMapper.getOrderProductDistinctById(orderId);