Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-01-23 a6c70be014537e9b5ed48e68edaf3a1a94cb1ac7

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

@@ -22,9 +22,10 @@
            glassTypeId = glassType.get(1);
        }
        Map<String,Object> map = new HashMap<>();
        map.put("list",productMapper.defaultProduct(offset,pageSize,glassTypeId,product));
        map.put("pageNum",pageNum);

        map.put("data",productMapper.defaultProduct(offset,pageSize,glassTypeId,product));
        map.put("total",productMapper.getPageTotal(offset,pageSize,glassTypeId,product));
        return map;
    }


}